fixed modal dialogs after event loop change

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

diff --git a/samples/vscroll/makefile.wat b/samples/vscroll/makefile.wat
index 6747bd4244bb7d3adb51e1947735ba4c27c88815..8b49952a42e9292bfa7cf6d4f5e7206229c53328 100644 (file)
--- a/samples/vscroll/makefile.wat
+++ b/samples/vscroll/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!
@@ -27,6 +27,13 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
 
 ### Conditionally set variables: ###
 
+LIBDIRNAME =
+!ifeq SHARED 0
+LIBDIRNAME = .\..\..\lib\wat_lib$(CFG)
+!endif
+!ifeq SHARED 1
+LIBDIRNAME = .\..\..\lib\wat_dll$(CFG)
+!endif
 PORTNAME =
 !ifeq USE_GUI 0
 PORTNAME = base
@@ -130,7 +137,7 @@ __RUNTIME_LIBS_5 =
 !endif
 __UNICODE_DEFINE_p =
 !ifeq UNICODE 1
-__UNICODE_DEFINE_p = -dwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -d_UNICODE
 !endif
 __WXLIB_BASE_p =
 !ifeq MONOLITHIC 0
@@ -153,19 +160,16 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 
 ### Variables: ###
 
-LIBDIRNAME = &
-       .\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-VSCROLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
+SETUPHDIR = &
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+VSTEST_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)
-VSCROLL_OBJECTS =  &
-       $(OBJS)\vscroll_vscroll.obj
-
+       $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) &
+       -i=.\..\..\samples $(CXXFLAGS)
+VSTEST_OBJECTS =  &
+       $(OBJS)\vstest_vstest.obj
 
 
 all : $(OBJS)
@@ -174,28 +178,28 @@ $(OBJS) :
 
 ### Targets: ###
 
-all : .SYMBOLIC $(OBJS)\vscroll.exe
+all : .SYMBOLIC $(OBJS)\vstest.exe
 
-$(OBJS)\vscroll_vscroll.obj :  .AUTODEPEND .\vscroll.cpp
-       $(CXX) -zq -fo=$^@ $(VSCROLL_CXXFLAGS) $<
+$(OBJS)\vstest_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=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples $<
 
-$(OBJS)\vscroll_vscroll.res :  .AUTODEPEND .\vscroll.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) $<
+$(OBJS)\vstest_vstest.obj :  .AUTODEPEND .\vstest.cpp
+       $(CXX) -zq -fo=$^@ $(VSTEST_CXXFLAGS) $<
 
 clean : .SYMBOLIC 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-       -if exist $(OBJS)\vscroll.exe del $(OBJS)\vscroll.exe
-
-$(OBJS)\vscroll.exe :  $(VSCROLL_OBJECTS) $(OBJS)\vscroll_vscroll.res
-       @%create $(OBJS)\vscroll.lbc
-       @%append $(OBJS)\vscroll.lbc option quiet
-       @%append $(OBJS)\vscroll.lbc name $^@
-       @%append $(OBJS)\vscroll.lbc option incremental
-       @%append $(OBJS)\vscroll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
-       @for %i in ($(VSCROLL_OBJECTS)) do @%append $(OBJS)\vscroll.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)\vscroll.lbc library %i
-       @%append $(OBJS)\vscroll.lbc option resource=$(OBJS)\vscroll_vscroll.res
-       wlink @$(OBJS)\vscroll.lbc
+       -if exist $(OBJS)\vstest.exe del $(OBJS)\vstest.exe
+
+$(OBJS)\vstest.exe :  $(VSTEST_OBJECTS) $(OBJS)\vstest_sample.res
+       @%create $(OBJS)\vstest.lbc
+       @%append $(OBJS)\vstest.lbc option quiet
+       @%append $(OBJS)\vstest.lbc name $^@
+       @%append $(OBJS)\vstest.lbc option caseexact
+       @%append $(OBJS)\vstest.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+       @for %i in ($(VSTEST_OBJECTS)) do @%append $(OBJS)\vstest.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)\vstest.lbc library %i
+       @%append $(OBJS)\vstest.lbc option resource=$(OBJS)\vstest_sample.res
+       wlink @$(OBJS)\vstest.lbc