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

Bumping the version number also requires that version.h be modified,

Browse Source 
and also rebaking the makeifles.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41767 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2006-10-09 01:20:56 +00:00
parent 6e27179817
commit 3abcf424a3
745 changed files with 9655 additions and 4626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
contrib/build/plot/makefile.wat
View File

@@ -115,6 +115,10 @@ __LIB_PNG_p =
!ifeq USE_GUI 1
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
__GDIPLUS_LIB_p =
!ifeq USE_GDIPLUS 1
__GDIPLUS_LIB_p = gdiplus.lib
!endif
__WXLIB_CORE_p =
!ifeq MONOLITHIC 0
__WXLIB_CORE_p = &
@@ -211,11 +215,15 @@ __UNICODE_DEFINE_p =
!ifeq UNICODE 1
__UNICODE_DEFINE_p = -d_UNICODE
!endif
__GFXCTX_DEFINE_p =
!ifeq USE_GDIPLUS 1
__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
!endif
### Variables: ###
WX_RELEASE_NODOT = 27
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)1
OBJS = &
wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = ..\..\src\plot\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
@@ -224,20 +232,21 @@ SETUPHDIR = &
PLOTDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\plot\..\..\..\include &
-wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\plot\..\..\include &
-dWXUSINGDLL -dWXMAKINGDLL_PLOT /fh=$(OBJS)\wxprec_plotdll.pch &
$(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
$(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
-i=..\..\src\plot\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
-i=..\..\src\plot\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_PLOT &
/fh=$(OBJS)\wxprec_plotdll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
$(CPPFLAGS) $(CXXFLAGS)
PLOTDLL_OBJECTS = &
$(OBJS)\plotdll_dummy.obj &
$(OBJS)\plotdll_plot.obj
PLOTLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\plot\..\..\..\include &
-wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\plot\..\..\include &
/fh=$(OBJS)\wxprec_plotlib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
$(CPPFLAGS) $(CXXFLAGS)
$(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
-i=..\..\src\plot\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
-i=..\..\src\plot\..\..\include /fh=$(OBJS)\wxprec_plotlib.pch &
$(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
PLOTLIB_OBJECTS = &
$(OBJS)\plotlib_dummy.obj &
$(OBJS)\plotlib_plot.obj
@@ -269,7 +278,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
@%append $(OBJS)\plotdll.lbc option caseexact
@%append $(OBJS)\plotdll.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME)
@for %i in ($(PLOTDLL_OBJECTS)) do @%append $(OBJS)\plotdll.lbc file %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\plotdll.lbc library %i
@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__GDIPLUS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) ) do @%append $(OBJS)\plotdll.lbc library %i
@%append $(OBJS)\plotdll.lbc option resource=$(OBJS)\plotdll_version.res
@%append $(OBJS)\plotdll.lbc system nt_dll
wlink @$(OBJS)\plotdll.lbc
@@ -287,7 +296,7 @@ $(OBJS)\plotdll_dummy.obj : .AUTODEPEND ../../src/plot\..\..\..\src\common\dumm
$(CXX) -bt=nt -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $<
$(OBJS)\plotdll_version.res : .AUTODEPEND ../../src/plot\..\..\..\src\msw\version.rc
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\plot\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG) $<
wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\plot\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_plot_wat$(VENDORTAG) $<
$(OBJS)\plotdll_plot.obj : .AUTODEPEND ../../src/plot\plot.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(PLOTDLL_CXXFLAGS) $<