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

Increase version to 2.9.5.

Browse Source 
Rebake all the project/make files.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@72007 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-07-10 23:51:44 +00:00
parent fd78ef4715
commit 14b682f7c3
621 changed files with 6616 additions and 3560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
samples/render/makefile.wat
View File

@@ -38,6 +38,17 @@ PORTNAME = base
!ifeq USE_GUI 1
PORTNAME = msw
!endif
COMPILER_VERSION =
!ifeq OFFICIAL_BUILD 1
COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
!endif
WXCOMPILER =
!ifeq OFFICIAL_BUILD 0
WXCOMPILER = _wat
!endif
!ifeq OFFICIAL_BUILD 1
WXCOMPILER = _wat$(COMPILER_VERSION)
!endif
WXDEBUGFLAG =
!ifeq BUILD debug
WXDEBUGFLAG = d
@@ -71,7 +82,7 @@ EXTRALIBS_FOR_BASE =
__renddll___depname =
!ifeq SHARED 1
__renddll___depname = &
$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll
$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll
!endif
__DEBUGINFO =
!ifeq BUILD debug
@@ -220,11 +231,12 @@ ____CAIRO_LIBDIR_FILENAMES = libpath $(CAIRO_ROOT)\lib
### Variables: ###
WX_RELEASE_NODOT = 29
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4
WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5
COMPILER_PREFIX = wat
OBJS = &
$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
LIBDIRNAME = &
.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
RENDER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
@@ -262,7 +274,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\render.exe del $(OBJS)\render.exe
-if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll
-if exist $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll del $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll
$(OBJS)\render.exe : $(RENDER_OBJECTS) $(OBJS)\render_sample.res
@%create $(OBJS)\render.lbc
@@ -277,7 +289,7 @@ $(OBJS)\render.exe : $(RENDER_OBJECTS) $(OBJS)\render_sample.res
wlink @$(OBJS)\render.lbc
!ifeq SHARED 1
$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll : $(RENDDLL_OBJECTS)
$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll : $(RENDDLL_OBJECTS)
@%create $(OBJS)\renddll.lbc
@%append $(OBJS)\renddll.lbc option quiet
@%append $(OBJS)\renddll.lbc name $^@