Add wxUSE_BASE checks for wxLog classes in the interface header.

[wxWidgets.git] / samples / render / makefile.wat

diff --git a/samples/render/makefile.wat b/samples/render/makefile.wat
index a31b7385ca51c0432961e7d7bb16eb51825819ae..560656ae857b44032526b4a3942ea0d894a5d1ec 100644 (file)
--- a/samples/render/makefile.wat
+++ b/samples/render/makefile.wat
@@ -38,6 +38,17 @@ PORTNAME = base
 !ifeq USE_GUI 1\r
 PORTNAME = msw\r
 !endif\r
 !ifeq USE_GUI 1\r
 PORTNAME = msw\r
 !endif\r

+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 =\r
 !ifeq BUILD debug\r
 WXDEBUGFLAG = d\r
 WXDEBUGFLAG =\r
 !ifeq BUILD debug\r
 WXDEBUGFLAG = d\r


@@ -71,7 +82,7 @@ EXTRALIBS_FOR_BASE =
 __renddll___depname =\r
 !ifeq SHARED 1\r
 __renddll___depname = &\r
 __renddll___depname =\r
 !ifeq SHARED 1\r
 __renddll___depname = &\r

-       $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll\r
+       $(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll

 !endif\r
 __DEBUGINFO =\r
 !ifeq BUILD debug\r
 !endif\r
 __DEBUGINFO =\r
 !ifeq BUILD debug\r


@@ -220,11 +231,12 @@ ____CAIRO_LIBDIR_FILENAMES = libpath $(CAIRO_ROOT)\lib
 ### Variables: ###\r
 \r
 WX_RELEASE_NODOT = 29\r
 ### Variables: ###\r
 \r
 WX_RELEASE_NODOT = 29\r

-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)4\r
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5

 COMPILER_PREFIX = wat\r
 OBJS = &\r
 COMPILER_PREFIX = wat\r
 OBJS = &\r

-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
+       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = &
+       .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)

 SETUPHDIR = &\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 RENDER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r
 SETUPHDIR = &\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 RENDER_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &\r


@@ -262,7 +274,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\render.exe del $(OBJS)\render.exe\r
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk\r
        -if exist $(OBJS)\*.pch del $(OBJS)\*.pch\r
        -if exist $(OBJS)\render.exe del $(OBJS)\render.exe\r

-       -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\r
+       -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

 \r
 $(OBJS)\render.exe :  $(RENDER_OBJECTS) $(OBJS)\render_sample.res\r
        @%create $(OBJS)\render.lbc\r
 \r
 $(OBJS)\render.exe :  $(RENDER_OBJECTS) $(OBJS)\render_sample.res\r
        @%create $(OBJS)\render.lbc\r


@@ -277,7 +289,7 @@ $(OBJS)\render.exe :  $(RENDER_OBJECTS) $(OBJS)\render_sample.res
        wlink @$(OBJS)\render.lbc\r
 \r
 !ifeq SHARED 1\r
        wlink @$(OBJS)\render.lbc\r
 \r
 !ifeq SHARED 1\r

-$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)_wat.dll :  $(RENDDLL_OBJECTS)\r
+$(OBJS)\renddll_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_VERSION_NODOT)$(WXCOMPILER).dll :  $(RENDDLL_OBJECTS)

        @%create $(OBJS)\renddll.lbc\r
        @%append $(OBJS)\renddll.lbc option quiet\r
        @%append $(OBJS)\renddll.lbc name $^@\r
        @%create $(OBJS)\renddll.lbc\r
        @%append $(OBJS)\renddll.lbc option quiet\r
        @%append $(OBJS)\renddll.lbc name $^@\r