updated

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21731 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/samples/console/makefile.bcc b/samples/console/makefile.bcc
index 09eb1683d70f09e0cc13b4894ab6c9a8e7f52692..af217aae8aacf5ecceeb7c58eac77ff7d4971499 100644 (file)
--- a/samples/console/makefile.bcc
+++ b/samples/console/makefile.bcc
@@ -74,7 +74,7 @@ WXUNIV = 0
 ### Variables: ###
 
 OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-CONSOLE_CXXFLAGS = $(CPPFLAGS)  -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I./../../src/tiff -I./../../src/jpeg -I./../../src/png -I./../../src/zlib  -I./../../src/regex -I. $(__DLLFLAG_p) $(__MULTILIB_FLAG_p) $(CXXFLAGS)
+CONSOLE_CXXFLAGS = $(CPPFLAGS)  $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2)  -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -I.\..\..\src\tiff -I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib  -I.\..\..\src\regex -I. $(__DLLFLAG_p) $(__MULTILIB_FLAG_p) $(CXXFLAGS)
 
 ### Conditionally set variables: ###
 
@@ -97,6 +97,12 @@ WXUNICODEFLAG = u
 WXUNIVNAME = univ
 !endif
 !if "$(BUILD)" == "debug"
+__DEBUGFLAG = -v
+!endif
+!if "$(BUILD)" == "release"
+__DEBUGFLAG = -v-
+!endif
+!if "$(BUILD)" == "debug"
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 !endif
 !if "$(SHARED)" == "1"
@@ -105,6 +111,12 @@ __DLLFLAG_p = -DWXUSINGDLL
 !if "$(MONOLITHIC)" == "0"
 __MULTILIB_FLAG_p = -DwxUSE_GUI=0
 !endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif
@@ -134,11 +146,10 @@ clean:
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\console.exe del $(OBJS)\console.exe
-       -if exist $(OBJS)\testdata.fc del $(OBJS)\testdata.fc
 
 $(OBJS)\console.exe: $(OBJS)\console_console.obj
-       ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  -ap -ap @&&|
-       c0x32.obj  $(OBJS)\console_console.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib cw32.lib,,
+       ilink32 -Tpe $(LDFLAGS) $(__DEBUGFLAG) -tWM -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  -ap @&&|
+       c0x32.obj  $(OBJS)\console_console.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib cw32mti.lib,,
 |
 
 data: 

diff --git a/samples/console/makefile.gcc b/samples/console/makefile.gcc
index fcd9511f27dc1fd1102bc4ace1474d51f56d242d..bacd24a54b4ea9adeb6a7a07915714dea937d6b5 100644 (file)
--- a/samples/console/makefile.gcc
+++ b/samples/console/makefile.gcc
@@ -122,7 +122,6 @@ $(OBJS)\console_console.o: .\console.cpp
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\console.exe del $(OBJS)\console.exe
-       -if exist $(OBJS)\testdata.fc del $(OBJS)\testdata.fc
 
 $(OBJS)\console.exe: $(OBJS)\console_console.o
        $(CXX) -o $@  $(OBJS)\console_console.o $(LDFLAGS) $(__DEBUGFLAG) -mthreads -L.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)    $(__WXLIB_MONO_p) $(__WXLIB_BASE_p) -lwxtiff$(WXDEBUGFLAG) -lwxjpeg$(WXDEBUGFLAG) -lwxpng$(WXDEBUGFLAG) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32

diff --git a/samples/console/makefile.vc b/samples/console/makefile.vc
index dd97ac79cfacebda4eb72d672deca405a162f967..7d03cdcdbd8b7c57a4f3974569de4845f96a49a1 100644 (file)
--- a/samples/console/makefile.vc
+++ b/samples/console/makefile.vc
@@ -43,7 +43,7 @@ WXUNIV = 0
 ### Variables: ###
 
 OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-CONSOLE_CXXFLAGS = $(CPPFLAGS) /MD /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) $(__MULTILIB_FLAG_p) $(CXXFLAGS)
+CONSOLE_CXXFLAGS = $(CPPFLAGS) /MD$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\console.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) $(__MULTILIB_FLAG_p) $(CXXFLAGS)
 
 ### Conditionally set variables: ###
 
@@ -66,6 +66,24 @@ WXUNICODEFLAG = u
 WXUNIVNAME = univ
 !endif
 !if "$(BUILD)" == "debug"
+__DEBUGFLAG_0 = /Zi
+!endif
+!if "$(BUILD)" == "release"
+__DEBUGFLAG_0 = 
+!endif
+!if "$(BUILD)" == "debug"
+__DEBUGFLAG_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release"
+__DEBUGFLAG_1 = 
+!endif
+!if "$(BUILD)" == "debug"
+__DEBUGFLAG_2 = d
+!endif
+!if "$(BUILD)" == "release"
+__DEBUGFLAG_2 = 
+!endif
+!if "$(BUILD)" == "debug"
 __DEBUG_DEFINE_p = /D__WXDEBUG__
 !endif
 !if "$(SHARED)" == "1"
@@ -74,6 +92,12 @@ __DLLFLAG_p = /DWXUSINGDLL
 !if "$(MONOLITHIC)" == "0"
 __MULTILIB_FLAG_p = /DwxUSE_GUI=0
 !endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_3 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_3 = /O2
+!endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
@@ -103,10 +127,9 @@ clean:
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\console.exe del $(OBJS)\console.exe
-       -if exist $(OBJS)\testdata.fc del $(OBJS)\testdata.fc
 
 $(OBJS)\console.exe: $(OBJS)\console_console.obj
-       link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  /SUBSYSTEM:CONSOLE /SUBSYSTEM:CONSOLE @<<
+       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1)  /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  /SUBSYSTEM:CONSOLE @<<
        $(OBJS)\console_console.obj  $(__WXLIB_MONO_p) $(__WXLIB_BASE_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
 <<
 

diff --git a/samples/console/makefile.wat b/samples/console/makefile.wat
index 73e674270d87f4edf312055dd0f5a17d9846c5c3..0d704f7e414084d2619503cfad87eb92f2ebe46e 100644 (file)
--- a/samples/console/makefile.wat
+++ b/samples/console/makefile.wat
@@ -134,7 +134,7 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 ### Variables: ###
 
 OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-CONSOLE_CXXFLAGS = $(CPPFLAGS)  $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm -br  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\include -i=.\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\src\tiff -i=.\src\jpeg -i=.\src\png -i=.\src\zlib  -i=.\src\regex -i=. $(__DLLFLAG_p) $(__MULTILIB_FLAG_p) $(CXXFLAGS)
+CONSOLE_CXXFLAGS = $(CPPFLAGS)  $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm -br  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib  -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $(__MULTILIB_FLAG_p) $(CXXFLAGS)
 
 
 
@@ -155,14 +155,13 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
        -if exist $(OBJS)\console.exe del $(OBJS)\console.exe
-       -if exist $(OBJS)\testdata.fc del $(OBJS)\testdata.fc
 
 $(OBJS)\console.exe :  $(OBJS)\console_console.obj
        @%create $(OBJS)\console.lbc
        @%append $(OBJS)\console.lbc option quiet
        @%append $(OBJS)\console.lbc name $^@
        @%append $(OBJS)\console.lbc option incremental
-       @%append $(OBJS)\console.lbc $(LDFLAGS) $(__DEBUGFLAG_1)  libpath .\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  system nt ref 'main_'
+       @%append $(OBJS)\console.lbc $(LDFLAGS) $(__DEBUGFLAG_1)  libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  system nt ref 'main_'
        @for %i in ( $(OBJS)\console_console.obj) do @%append $(OBJS)\console.lbc file %i
        @for %i in ( $(__WXLIB_MONO_p) $(__WXLIB_BASE_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) do @%append $(OBJS)\console.lbc library %i
        @%append $(OBJS)\console.lbc

diff --git a/samples/dialogs/makefile.bcc b/samples/dialogs/makefile.bcc
index 28365b641e355047dbfb40e8d74a8f562eceaadf..aea7672dd56eb47df7f5997865c094f55f6dc712 100644 (file)
--- a/samples/dialogs/makefile.bcc
+++ b/samples/dialogs/makefile.bcc
@@ -74,7 +74,7 @@ WXUNIV = 0
 ### Variables: ###
 
 OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-DIALOGS_CXXFLAGS = $(CPPFLAGS)  -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(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)
+DIALOGS_CXXFLAGS = $(CPPFLAGS)  $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2)  -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\bcc_$(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)
 
 ### Conditionally set variables: ###
 
@@ -97,6 +97,12 @@ WXUNICODEFLAG = u
 WXUNIVNAME = univ
 !endif
 !if "$(BUILD)" == "debug"
+__DEBUGFLAG = -v
+!endif
+!if "$(BUILD)" == "release"
+__DEBUGFLAG = -v-
+!endif
+!if "$(BUILD)" == "debug"
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 !endif
 !if "$(BUILD)" == "debug"
@@ -108,6 +114,12 @@ __DLLFLAG_p = -DWXUSINGDLL
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_1 = -dWXUSINGDLL
 !endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif
@@ -143,21 +155,20 @@ $(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp
        $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) $**
 
 $(OBJS)\dialogs_dialogs.res: .\dialogs.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(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) $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(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) $**
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe
-       -if exist $(OBJS)\tips.txt del $(OBJS)\tips.txt
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
        for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\dialogs.exe: $(OBJS)\dialogs_dialogs.obj  $(OBJS)\dialogs_dialogs.res
-       ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  -aa @&&|
-       c0w32.obj  $(OBJS)\dialogs_dialogs.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib cw32.lib,, $(OBJS)\dialogs_dialogs.res
+       ilink32 -Tpe $(LDFLAGS) $(__DEBUGFLAG) -tWM -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  -aa @&&|
+       c0w32.obj  $(OBJS)\dialogs_dialogs.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mti.lib,, $(OBJS)\dialogs_dialogs.res
 |
 
 install: all

diff --git a/samples/dialogs/makefile.gcc b/samples/dialogs/makefile.gcc
index c94374cdb35dabd175cd82429b9d1e11d4452f90..0d1daff1340ab0c186968ace4463175741048760 100644 (file)
--- a/samples/dialogs/makefile.gcc
+++ b/samples/dialogs/makefile.gcc
@@ -137,7 +137,6 @@ $(OBJS)\dialogs_dialogs_rc.o: .\dialogs.rc
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe
-       -if exist $(OBJS)\tips.txt del $(OBJS)\tips.txt
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)

diff --git a/samples/dialogs/makefile.vc b/samples/dialogs/makefile.vc
index 1498f06a71dd3f4c3a3f09d6eefe8a3380ac2b31..cc5676a09e404c6700cc21844456426d96c31914 100644 (file)
--- a/samples/dialogs/makefile.vc
+++ b/samples/dialogs/makefile.vc
@@ -43,7 +43,7 @@ WXUNIV = 0
 ### Variables: ###
 
 OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-DIALOGS_CXXFLAGS = $(CPPFLAGS) /MD /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)
+DIALOGS_CXXFLAGS = $(CPPFLAGS) /MD$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\dialogs.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)
 
 ### Conditionally set variables: ###
 
@@ -66,6 +66,24 @@ WXUNICODEFLAG = u
 WXUNIVNAME = univ
 !endif
 !if "$(BUILD)" == "debug"
+__DEBUGFLAG_0 = /Zi
+!endif
+!if "$(BUILD)" == "release"
+__DEBUGFLAG_0 = 
+!endif
+!if "$(BUILD)" == "debug"
+__DEBUGFLAG_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release"
+__DEBUGFLAG_1 = 
+!endif
+!if "$(BUILD)" == "debug"
+__DEBUGFLAG_2 = d
+!endif
+!if "$(BUILD)" == "release"
+__DEBUGFLAG_2 = 
+!endif
+!if "$(BUILD)" == "debug"
 __DEBUG_DEFINE_p = /D__WXDEBUG__
 !endif
 !if "$(BUILD)" == "debug"
@@ -77,6 +95,12 @@ __DLLFLAG_p = /DWXUSINGDLL
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_1 = /dWXUSINGDLL
 !endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_3 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_3 = /O2
+!endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
@@ -112,20 +136,19 @@ $(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(DIALOGS_CXXFLAGS) $**
 
 $(OBJS)\dialogs_dialogs.res: .\dialogs.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$@ /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) $**
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe
-       -if exist $(OBJS)\tips.txt del $(OBJS)\tips.txt
 
 data: 
        if not exist $(OBJS) mkdir $(OBJS)
        for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\dialogs.exe: $(OBJS)\dialogs_dialogs.obj $(OBJS)\dialogs_dialogs.res
-       link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  /SUBSYSTEM:WINDOWS @<<
+       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1)  /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  /SUBSYSTEM:WINDOWS @<<
        $(OBJS)\dialogs_dialogs.obj $(OBJS)\dialogs_dialogs.res  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_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
 <<
 

diff --git a/samples/dialogs/makefile.wat b/samples/dialogs/makefile.wat
index 8dfc9b250b7038153ecf966a88c14a78bad14ab6..0903cc2d4ca1d467ec2c48e6ed6547bdd591d928 100644 (file)
--- a/samples/dialogs/makefile.wat
+++ b/samples/dialogs/makefile.wat
@@ -134,7 +134,7 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 ### Variables: ###
 
 OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-DIALOGS_CXXFLAGS = $(CPPFLAGS)  $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm -br  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\include -i=.\lib\wat_$(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)
+DIALOGS_CXXFLAGS = $(CPPFLAGS)  $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm -br  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(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)
 
 
 
@@ -150,7 +150,7 @@ $(OBJS)\dialogs_dialogs.obj :  .AUTODEPEND .\dialogs.cpp
        $(CXX) -zq -fo=$^@ $(DIALOGS_CXXFLAGS) $<
 
 $(OBJS)\dialogs_dialogs.res :  .AUTODEPEND .\dialogs.rc
-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\include -i=.\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\src\tiff -i=.\src\jpeg -i=.\src\png -i=.\src\zlib  -i=.\src\regex -i=. $(__DLLFLAG_p) $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib  -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $<
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -158,7 +158,6 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
        -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe
-       -if exist $(OBJS)\tips.txt del $(OBJS)\tips.txt
 
 data :  
        if not exist $(OBJS) mkdir $(OBJS)
@@ -169,9 +168,9 @@ $(OBJS)\dialogs.exe :  $(OBJS)\dialogs_dialogs.obj $(OBJS)\dialogs_dialogs.res
        @%append $(OBJS)\dialogs.lbc option quiet
        @%append $(OBJS)\dialogs.lbc name $^@
        @%append $(OBJS)\dialogs.lbc option incremental
-       @%append $(OBJS)\dialogs.lbc $(LDFLAGS) $(__DEBUGFLAG_1)  libpath .\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  system nt_win ref '_WinMain@16'
+       @%append $(OBJS)\dialogs.lbc $(LDFLAGS) $(__DEBUGFLAG_1)  libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  system nt_win ref '_WinMain@16'
        @for %i in ( $(OBJS)\dialogs_dialogs.obj) do @%append $(OBJS)\dialogs.lbc file %i
-       @for %i in ( $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_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) do @%append $(OBJS)\dialogs.lbc library %i
+       @for %i in ( $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_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 ) do @%append $(OBJS)\dialogs.lbc library %i
        @%append $(OBJS)\dialogs.lbc option resource=$(OBJS)\dialogs_dialogs.res
        wlink @$(OBJS)\dialogs.lbc
 

diff --git a/samples/minimal/makefile.bcc b/samples/minimal/makefile.bcc
index 9e07022bbea85ac3d4507f49ac33d18fccad9a21..6df2c4f89f4d395aaf77daebd00b51bf08f10e92 100644 (file)
--- a/samples/minimal/makefile.bcc
+++ b/samples/minimal/makefile.bcc
@@ -74,7 +74,7 @@ WXUNIV = 0
 ### Variables: ###
 
 OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-MINIMAL_CXXFLAGS = $(CPPFLAGS)  -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I./../../include -I./../../lib\bcc_$(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)
+MINIMAL_CXXFLAGS = $(CPPFLAGS)  $(__DEBUGFLAG) $(__OPTIMIZEFLAG_2)  -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I.\..\..\lib\bcc_$(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)
 
 ### Conditionally set variables: ###
 
@@ -97,6 +97,12 @@ WXUNICODEFLAG = u
 WXUNIVNAME = univ
 !endif
 !if "$(BUILD)" == "debug"
+__DEBUGFLAG = -v
+!endif
+!if "$(BUILD)" == "release"
+__DEBUGFLAG = -v-
+!endif
+!if "$(BUILD)" == "debug"
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 !endif
 !if "$(BUILD)" == "debug"
@@ -108,6 +114,12 @@ __DLLFLAG_p = -DWXUSINGDLL
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_1 = -dWXUSINGDLL
 !endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_2 = -Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2
+!endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif
@@ -143,7 +155,7 @@ $(OBJS)\minimal_minimal.obj: .\minimal.cpp
        $(CXX) -q -c -P -o$@ $(MINIMAL_CXXFLAGS) $**
 
 $(OBJS)\minimal_minimal.res: .\minimal.rc
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i./../../include -i./../../lib\bcc_$(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) $**
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\include -i.\..\..\lib\bcc_$(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) $**
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -153,8 +165,8 @@ clean:
 install: all
 
 $(OBJS)\minimal.exe: $(OBJS)\minimal_minimal.obj  $(OBJS)\minimal_minimal.res
-       ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  -aa @&&|
-       c0w32.obj  $(OBJS)\minimal_minimal.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib cw32.lib,, $(OBJS)\minimal_minimal.res
+       ilink32 -Tpe $(LDFLAGS) $(__DEBUGFLAG) -tWM -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  -aa @&&|
+       c0w32.obj  $(OBJS)\minimal_minimal.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mti.lib,, $(OBJS)\minimal_minimal.res
 |
 
 uninstall: 

diff --git a/samples/minimal/makefile.vc b/samples/minimal/makefile.vc
index 6e1b1a7f69bc46a0b6e11ca4bb83a6bd84f7e881..d309162a1aa8bd1d30655d594afbd7e61943e8d8 100644 (file)
--- a/samples/minimal/makefile.vc
+++ b/samples/minimal/makefile.vc
@@ -43,7 +43,7 @@ WXUNIV = 0
 ### Variables: ###
 
 OBJS = vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-MINIMAL_CXXFLAGS = $(CPPFLAGS) /MD /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)
+MINIMAL_CXXFLAGS = $(CPPFLAGS) /MD$(__DEBUGFLAG_2) $(__DEBUGFLAG_0) /Fd$(OBJS)\minimal.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)
 
 ### Conditionally set variables: ###
 
@@ -66,6 +66,24 @@ WXUNICODEFLAG = u
 WXUNIVNAME = univ
 !endif
 !if "$(BUILD)" == "debug"
+__DEBUGFLAG_0 = /Zi
+!endif
+!if "$(BUILD)" == "release"
+__DEBUGFLAG_0 = 
+!endif
+!if "$(BUILD)" == "debug"
+__DEBUGFLAG_1 = /DEBUG
+!endif
+!if "$(BUILD)" == "release"
+__DEBUGFLAG_1 = 
+!endif
+!if "$(BUILD)" == "debug"
+__DEBUGFLAG_2 = d
+!endif
+!if "$(BUILD)" == "release"
+__DEBUGFLAG_2 = 
+!endif
+!if "$(BUILD)" == "debug"
 __DEBUG_DEFINE_p = /D__WXDEBUG__
 !endif
 !if "$(BUILD)" == "debug"
@@ -77,6 +95,12 @@ __DLLFLAG_p = /DWXUSINGDLL
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_1 = /dWXUSINGDLL
 !endif
+!if "$(BUILD)" == "debug"
+__OPTIMIZEFLAG_3 = /Od
+!endif
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_3 = /O2
+!endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = /DwxUSE_UNICODE=1
 !endif
@@ -112,7 +136,7 @@ $(OBJS)\minimal_minimal.obj: .\minimal.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(MINIMAL_CXXFLAGS) $**
 
 $(OBJS)\minimal_minimal.res: .\minimal.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$@ /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) $**
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -122,7 +146,7 @@ clean:
 install: all
 
 $(OBJS)\minimal.exe: $(OBJS)\minimal_minimal.obj $(OBJS)\minimal_minimal.res
-       link /NOLOGO /OUT:$@ $(LDFLAGS) /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  /SUBSYSTEM:WINDOWS @<<
+       link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGFLAG_1)  /LIBPATH:.\..\..\lib\vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  /SUBSYSTEM:WINDOWS @<<
        $(OBJS)\minimal_minimal.obj $(OBJS)\minimal_minimal.res  $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_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
 <<
 

diff --git a/samples/minimal/makefile.wat b/samples/minimal/makefile.wat
index 76a3f4ab689031738289b9c1fe302de97c1e85a5..55a142f0382cd53936ff76e7dd958755c67c0098 100644 (file)
--- a/samples/minimal/makefile.wat
+++ b/samples/minimal/makefile.wat
@@ -134,7 +134,7 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 ### Variables: ###
 
 OBJS = wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-MINIMAL_CXXFLAGS = $(CPPFLAGS)  $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm -br  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\include -i=.\lib\wat_$(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)
+MINIMAL_CXXFLAGS = $(CPPFLAGS)  $(__DEBUGFLAG_0) $(__OPTIMIZEFLAG_2) -bm -br  -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(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)
 
 
 
@@ -150,7 +150,7 @@ $(OBJS)\minimal_minimal.obj :  .AUTODEPEND .\minimal.cpp
        $(CXX) -zq -fo=$^@ $(MINIMAL_CXXFLAGS) $<
 
 $(OBJS)\minimal_minimal.res :  .AUTODEPEND .\minimal.rc
-       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\include -i=.\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\src\tiff -i=.\src\jpeg -i=.\src\png -i=.\src\zlib  -i=.\src\regex -i=. $(__DLLFLAG_p) $<
+       wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=.\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) -i=.\..\..\src\tiff -i=.\..\..\src\jpeg -i=.\..\..\src\png -i=.\..\..\src\zlib  -i=.\..\..\src\regex -i=. $(__DLLFLAG_p) $<
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -166,9 +166,9 @@ $(OBJS)\minimal.exe :  $(OBJS)\minimal_minimal.obj $(OBJS)\minimal_minimal.res
        @%append $(OBJS)\minimal.lbc option quiet
        @%append $(OBJS)\minimal.lbc name $^@
        @%append $(OBJS)\minimal.lbc option incremental
-       @%append $(OBJS)\minimal.lbc $(LDFLAGS) $(__DEBUGFLAG_1)  libpath .\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  system nt_win ref '_WinMain@16'
+       @%append $(OBJS)\minimal.lbc $(LDFLAGS) $(__DEBUGFLAG_1)  libpath .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  system nt_win ref '_WinMain@16'
        @for %i in ( $(OBJS)\minimal_minimal.obj) do @%append $(OBJS)\minimal.lbc file %i
-       @for %i in ( $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_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) do @%append $(OBJS)\minimal.lbc library %i
+       @for %i in ( $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_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 ) do @%append $(OBJS)\minimal.lbc library %i
        @%append $(OBJS)\minimal.lbc option resource=$(OBJS)\minimal_minimal.res
        wlink @$(OBJS)\minimal.lbc