X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e80ae200205aeba58035c6e46f70dc59f1b7523e..25088f1eea365f0da7aeb565932dd4fe0fd5d20e:/contrib/samples/deprecated/treelay/makefile.wat

diff --git a/contrib/samples/deprecated/treelay/makefile.wat b/contrib/samples/deprecated/treelay/makefile.wat
index 815ddab61f..7bfa350a6f 100644
--- a/contrib/samples/deprecated/treelay/makefile.wat
+++ b/contrib/samples/deprecated/treelay/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
@@ -153,22 +160,18 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 
 ### Variables: ###
 
-LIBDIRNAME = &
-	.\..\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = &
 	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = &
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 TREELAY_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) -i=.\..\..\..\include $(CXXFLAGS)
+	$(__UNICODE_DEFINE_p) -i=.\..\..\..\..\include -i=$(SETUPHDIR) -i=. &
+	$(__DLLFLAG_p) -i=.\..\..\..\..\samples -i=.\..\..\..\include $(CXXFLAGS)
 TREELAY_OBJECTS =  &
 	$(OBJS)\treelay_treelay.obj
 
 
-
 all : $(OBJS)
 $(OBJS) :
 	-if not exist $(OBJS) mkdir $(OBJS)
@@ -181,7 +184,7 @@ $(OBJS)\treelay_treelay.obj :  .AUTODEPEND .\treelay.cpp
 	$(CXX) -zq -fo=$^@ $(TREELAY_CXXFLAGS) $<
 
 $(OBJS)\treelay_treelay.res :  .AUTODEPEND .\treelay.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) -i=.\..\..\..\include $<
+	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 -i=.\..\..\..\include $<
 
 clean : .SYMBOLIC 
 	-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -194,9 +197,9 @@ $(OBJS)\treelay.exe :  $(TREELAY_OBJECTS) $(OBJS)\treelay_treelay.res
 	@%create $(OBJS)\treelay.lbc
 	@%append $(OBJS)\treelay.lbc option quiet
 	@%append $(OBJS)\treelay.lbc name $^@
-	@%append $(OBJS)\treelay.lbc option incremental
+	@%append $(OBJS)\treelay.lbc option caseexact
 	@%append $(OBJS)\treelay.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
 	@for %i in ($(TREELAY_OBJECTS)) do @%append $(OBJS)\treelay.lbc file %i
-	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__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)\treelay.lbc library %i
+	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib $(__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)\treelay.lbc library %i
 	@%append $(OBJS)\treelay.lbc option resource=$(OBJS)\treelay_treelay.res
 	wlink @$(OBJS)\treelay.lbc