1) some compilers (Watcom) don't like it if wxBase library PCH file contains

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

diff --git a/samples/multimon/makefile.wat b/samples/multimon/makefile.wat
index 64a56aeb77fbb3d3795368cefb5b11ea69253379..5ad470f66c1a7a90d66fec34f0a7a80ef2d022f7 100644 (file)
--- a/samples/multimon/makefile.wat
+++ b/samples/multimon/makefile.wat
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-!include ../../build/config.wat
+!include ../../build/msw/config.wat
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -155,17 +155,18 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 
 LIBDIRNAME = &
        .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-MULTIMON_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
+MULTIMON_TEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
        $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
        $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(LIBDIRNAME) &
        -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png &
        -i=.\..\..\src\zlib -i=.\..\..\src\regex -i=.\..\..\src\expat\lib -i=. &
        $(__DLLFLAG_p) $(CXXFLAGS)
-MULTIMON_OBJECTS =  &
-       $(OBJS)\multimon_multimon.obj
+MULTIMON_TEST_OBJECTS =  &
+       $(OBJS)\multimon_test_multimon_test.obj
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 
+MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) RUNTIME_LIBS=$(RUNTIME_LIBS) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
 
 
 all : $(OBJS)
@@ -174,12 +175,12 @@ $(OBJS) :
 
 ### Targets: ###
 
-all : .SYMBOLIC $(OBJS)\multimon.exe
+all : .SYMBOLIC $(OBJS)\multimon_test.exe
 
-$(OBJS)\multimon_multimon.obj :  .AUTODEPEND .\multimon.cpp
-       $(CXX) -zq -fo=$^@ $(MULTIMON_CXXFLAGS) $<
+$(OBJS)\multimon_test_multimon_test.obj :  .AUTODEPEND .\multimon_test.cpp
+       $(CXX) -zq -fo=$^@ $(MULTIMON_TEST_CXXFLAGS) $<
 
-$(OBJS)\multimon_multimon.res :  .AUTODEPEND .\multimon.rc
+$(OBJS)\multimon_test_sample.res :  .AUTODEPEND .\..\..\samples\sample.rc
        wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(LIBDIRNAME) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib  -i=.\..\..\src\regex -i=.\..\..\src\expat\lib -i=. $(__DLLFLAG_p) $<
 
 clean : .SYMBOLIC 
@@ -187,15 +188,15 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-       -if exist $(OBJS)\multimon.exe del $(OBJS)\multimon.exe
-
-$(OBJS)\multimon.exe :  $(MULTIMON_OBJECTS) $(OBJS)\multimon_multimon.res
-       @%create $(OBJS)\multimon.lbc
-       @%append $(OBJS)\multimon.lbc option quiet
-       @%append $(OBJS)\multimon.lbc name $^@
-       @%append $(OBJS)\multimon.lbc option incremental
-       @%append $(OBJS)\multimon.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-       @for %i in ($(MULTIMON_OBJECTS)) do @%append $(OBJS)\multimon.lbc file %i
-       @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) 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 ) do @%append $(OBJS)\multimon.lbc library %i
-       @%append $(OBJS)\multimon.lbc option resource=$(OBJS)\multimon_multimon.res
-       wlink @$(OBJS)\multimon.lbc
+       -if exist $(OBJS)\multimon_test.exe del $(OBJS)\multimon_test.exe
+
+$(OBJS)\multimon_test.exe :  $(MULTIMON_TEST_OBJECTS) $(OBJS)\multimon_test_sample.res
+       @%create $(OBJS)\multimon_test.lbc
+       @%append $(OBJS)\multimon_test.lbc option quiet
+       @%append $(OBJS)\multimon_test.lbc name $^@
+       @%append $(OBJS)\multimon_test.lbc option incremental
+       @%append $(OBJS)\multimon_test.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+       @for %i in ($(MULTIMON_TEST_OBJECTS)) do @%append $(OBJS)\multimon_test.lbc file %i
+       @for %i in ( $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) 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 ) do @%append $(OBJS)\multimon_test.lbc library %i
+       @%append $(OBJS)\multimon_test.lbc option resource=$(OBJS)\multimon_test_sample.res
+       wlink @$(OBJS)\multimon_test.lbc