Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. use three numbers version in win32 DLLs on unstable branch

Browse Source 
2. automatically increase major soname version with every unstable release


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@22292 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-07-25 12:38:48 +00:00
parent 646c4aebb2
commit bdc408c4c6
475 changed files with 4461 additions and 2802 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
samples/html/zip/makefile.vc
View File

@@ -13,7 +13,7 @@
### Variables: ###
OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
ZIP_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_6)$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\zip.pdb $(__OPTIMIZEFLAG_3) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I. $(__DLLFLAG_p) $(CXXFLAGS)
ZIP_CXXFLAGS = $(CPPFLAGS) /M$(__RUNTIME_LIBS_7)$(__DEBUGFLAG_2) /DWIN32 $(__DEBUGFLAG_0) /Fd$(OBJS)\zip.pdb $(____DEBUGFLAG_3_p) $(__OPTIMIZEFLAG_4) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\..\..\include /I.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /I.\..\..\..\src\tiff /I.\..\..\..\src\jpeg /I.\..\..\..\src\png /I.\..\..\..\src\zlib /I.\..\..\..\src\regex /I.\..\..\..\src\expat\lib /I. $(__DLLFLAG_p) /D_WINDOWS $(CXXFLAGS)
### Conditionally set variables: ###
@@ -66,16 +66,16 @@ __DLLFLAG_p = /DWXUSINGDLL
__DLLFLAG_p_1 = /dWXUSINGDLL
!endif
!if "$(BUILD)" == "debug"
__OPTIMIZEFLAG_3 = /Od
__OPTIMIZEFLAG_4 = /Od
!endif
!if "$(BUILD)" == "release"
__OPTIMIZEFLAG_3 = /O2
__OPTIMIZEFLAG_4 = /O2
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS_6 = D
__RUNTIME_LIBS_7 = D
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_6 = T
__RUNTIME_LIBS_7 = T
!endif
!if "$(UNICODE)" == "1"
__UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
@@ -101,6 +101,18 @@ __WXUNIV_DEFINE_p = /D__WXUNIVERSAL__
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p_1 = /d__WXUNIVERSAL__
!endif
!if "$(BUILD)" == "debug"
____DEBUGFLAG_3_p = /D_DEBUG
!endif
!if "$(BUILD)" == "release"
____DEBUGFLAG_3_p = /DNDEBUG
!endif
!if "$(BUILD)" == "debug"
____DEBUGFLAG_3_p_1 = /d_DEBUG
!endif
!if "$(BUILD)" == "release"
____DEBUGFLAG_3_p_1 = /dNDEBUG
!endif
all: $(OBJS)
@@ -115,7 +127,7 @@ $(OBJS)\zip_zip.obj: .\zip.cpp
$(CXX) /c /nologo /TP /Fo$@ $(ZIP_CXXFLAGS) $**
$(OBJS)\zip_zip.res: .\zip.rc
rc /fo$@ /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\..\include /i.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\..\src\tiff /i.\..\..\..\src\jpeg /i.\..\..\..\src\png /i.\..\..\..\src\zlib /i.\..\..\..\src\regex /i. $(__DLLFLAG_p_1) $**
rc /fo$@ /dWIN32 $(____DEBUGFLAG_3_p_1) /d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) /i.\..\..\..\include /i.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /i.\..\..\..\src\tiff /i.\..\..\..\src\jpeg /i.\..\..\..\src\png /i.\..\..\..\src\zlib /i.\..\..\..\src\regex /i.\..\..\..\src\expat\lib /i. $(__DLLFLAG_p_1) /d_WINDOWS $**
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -127,6 +139,6 @@ data:
for %f in (pages.zip start.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
$(OBJS)\zip.exe: $(OBJS)\zip_zip.obj $(OBJS)\zip_zip.res
link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<<
$(OBJS)\zip_zip.obj $(OBJS)\zip_zip.res $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1) /LIBPATH:.\..\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) /SUBSYSTEM:WINDOWS @<<
$(OBJS)\zip_zip.obj $(OBJS)\zip_zip.res $(__WXLIB_HTML_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib
<<