X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd9f42b6a94f9d68c66cf363093442b12cd4e953..3527f29c8769e09d796c547c0c309f8b86407012:/contrib/build/deprecated/makefile.wat

diff --git a/contrib/build/deprecated/makefile.wat b/contrib/build/deprecated/makefile.wat
index a377119977..d33d14c06f 100644
--- a/contrib/build/deprecated/makefile.wat
+++ b/contrib/build/deprecated/makefile.wat
@@ -27,6 +27,13 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
 
 ### Conditionally set variables: ###
 
+LIBDIRNAME =
+!ifeq SHARED 0
+LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\wat_lib$(CFG)
+!endif
+!ifeq SHARED 1
+LIBDIRNAME = ..\..\src\deprecated\..\..\..\lib\wat_dll$(CFG)
+!endif
 PORTNAME =
 !ifeq USE_GUI 0
 PORTNAME = base
@@ -105,6 +112,13 @@ __DEBUG_DEFINE_p = -d__WXDEBUG__
 !ifeq DEBUG_FLAG 1
 __DEBUG_DEFINE_p = -d__WXDEBUG__
 !endif
+__EXCEPTIONSFLAG =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG = 
+!endif
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG = -xs
+!endif
 __LIB_JPEG_p =
 !ifeq USE_GUI 1
 __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
@@ -133,7 +147,7 @@ __RUNTIME_LIBS =
 !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
@@ -156,7 +170,7 @@ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 __deprecateddll___depname =
 !ifeq SHARED 1
 __deprecateddll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll
 !endif
 __deprecatedlib___depname =
 !ifeq SHARED 0
@@ -169,70 +183,49 @@ __deprecatedlib___depname = &
 DEPRECATEDDLL_CFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include &
-	-i=$(LIBDIRNAME) -i=..\..\src\deprecated\..\..\..\src\tiff &
-	-i=..\..\src\deprecated\..\..\..\src\jpeg &
-	-i=..\..\src\deprecated\..\..\..\src\png &
-	-i=..\..\src\deprecated\..\..\..\src\zlib &
-	-i=..\..\src\deprecated\..\..\..\src\regex &
-	-i=..\..\src\deprecated\..\..\..\src\expat\lib &
-	-i=..\..\src\deprecated\..\..\include -dWXUSINGDLL &
-	-dWXMAKINGDLL_DEPRECATED $(CFLAGS)
+	-i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL &
+	-dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated $(CFLAGS)
 DEPRECATEDDLL_CXXFLAGS = $(CPPFLAGS) -bd $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include &
-	-i=$(LIBDIRNAME) -i=..\..\src\deprecated\..\..\..\src\tiff &
-	-i=..\..\src\deprecated\..\..\..\src\jpeg &
-	-i=..\..\src\deprecated\..\..\..\src\png &
-	-i=..\..\src\deprecated\..\..\..\src\zlib &
-	-i=..\..\src\deprecated\..\..\..\src\regex &
-	-i=..\..\src\deprecated\..\..\..\src\expat\lib &
-	-i=..\..\src\deprecated\..\..\include -dWXUSINGDLL &
-	-dWXMAKINGDLL_DEPRECATED $(CXXFLAGS) /fh=$(OBJS)\wxprec_deprecateddll.pch
+	-i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include -dWXUSINGDLL &
+	-dWXMAKINGDLL_DEPRECATED -i=..\..\src\deprecated $(CXXFLAGS) &
+	/fh=$(OBJS)\wxprec_deprecateddll.pch $(__EXCEPTIONSFLAG)
 DEPRECATEDDLL_OBJECTS =  &
 	$(OBJS)\deprecateddll_dummy.obj &
 	$(OBJS)\deprecateddll_prop.obj &
 	$(OBJS)\deprecateddll_propform.obj &
 	$(OBJS)\deprecateddll_proplist.obj &
 	$(OBJS)\deprecateddll_resource.obj &
+	$(OBJS)\deprecateddll_tbarsmpl.obj &
 	$(OBJS)\deprecateddll_treelay.obj &
 	$(OBJS)\deprecateddll_wxexpr.obj &
 	$(OBJS)\deprecateddll_dosyacc.obj
 DEPRECATEDLIB_CFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include &
-	-i=$(LIBDIRNAME) -i=..\..\src\deprecated\..\..\..\src\tiff &
-	-i=..\..\src\deprecated\..\..\..\src\jpeg &
-	-i=..\..\src\deprecated\..\..\..\src\png &
-	-i=..\..\src\deprecated\..\..\..\src\zlib &
-	-i=..\..\src\deprecated\..\..\..\src\regex &
-	-i=..\..\src\deprecated\..\..\..\src\expat\lib &
-	-i=..\..\src\deprecated\..\..\include $(CFLAGS)
+	-i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include &
+	-i=..\..\src\deprecated $(CFLAGS)
 DEPRECATEDLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm &
 	$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
 	$(__UNICODE_DEFINE_p) -i=..\..\src\deprecated\..\..\..\include &
-	-i=$(LIBDIRNAME) -i=..\..\src\deprecated\..\..\..\src\tiff &
-	-i=..\..\src\deprecated\..\..\..\src\jpeg &
-	-i=..\..\src\deprecated\..\..\..\src\png &
-	-i=..\..\src\deprecated\..\..\..\src\zlib &
-	-i=..\..\src\deprecated\..\..\..\src\regex &
-	-i=..\..\src\deprecated\..\..\..\src\expat\lib &
-	-i=..\..\src\deprecated\..\..\include $(CXXFLAGS) &
-	/fh=$(OBJS)\wxprec_deprecatedlib.pch
+	-i=$(SETUPHDIR) -i=..\..\src\deprecated\..\..\include &
+	-i=..\..\src\deprecated $(CXXFLAGS) /fh=$(OBJS)\wxprec_deprecatedlib.pch &
+	$(__EXCEPTIONSFLAG)
 DEPRECATEDLIB_OBJECTS =  &
 	$(OBJS)\deprecatedlib_dummy.obj &
 	$(OBJS)\deprecatedlib_prop.obj &
 	$(OBJS)\deprecatedlib_propform.obj &
 	$(OBJS)\deprecatedlib_proplist.obj &
 	$(OBJS)\deprecatedlib_resource.obj &
+	$(OBJS)\deprecatedlib_tbarsmpl.obj &
 	$(OBJS)\deprecatedlib_treelay.obj &
 	$(OBJS)\deprecatedlib_wxexpr.obj &
 	$(OBJS)\deprecatedlib_dosyacc.obj
-LIBDIRNAME = &
-	..\..\src\deprecated\..\..\..\lib\wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = &
 	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-
-MAKEARGS = BUILD=$(BUILD) CC=$(CC) CFG=$(CFG) CFLAGS=$(CFLAGS) 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) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
+SETUPHDIR = &
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 
 
 all : $(OBJS)
@@ -261,6 +254,9 @@ $(OBJS)\deprecateddll_proplist.obj :  .AUTODEPEND ../../src/deprecated\proplist.
 $(OBJS)\deprecateddll_resource.obj :  .AUTODEPEND ../../src/deprecated\resource.cpp
 	$(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
 
+$(OBJS)\deprecateddll_tbarsmpl.obj :  .AUTODEPEND ../../src/deprecated\tbarsmpl.cpp
+	$(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
+
 $(OBJS)\deprecateddll_treelay.obj :  .AUTODEPEND ../../src/deprecated\treelay.cpp
 	$(CXX) -zq -fo=$^@ $(DEPRECATEDDLL_CXXFLAGS) $<
 
@@ -285,6 +281,9 @@ $(OBJS)\deprecatedlib_proplist.obj :  .AUTODEPEND ../../src/deprecated\proplist.
 $(OBJS)\deprecatedlib_resource.obj :  .AUTODEPEND ../../src/deprecated\resource.cpp
 	$(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
 
+$(OBJS)\deprecatedlib_tbarsmpl.obj :  .AUTODEPEND ../../src/deprecated\tbarsmpl.cpp
+	$(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
+
 $(OBJS)\deprecatedlib_treelay.obj :  .AUTODEPEND ../../src/deprecated\treelay.cpp
 	$(CXX) -zq -fo=$^@ $(DEPRECATEDLIB_CXXFLAGS) $<
 
@@ -296,19 +295,19 @@ 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 $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib
 
 !ifeq SHARED 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll :  $(DEPRECATEDDLL_OBJECTS)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated_wat$(VENDORTAG).dll :  $(DEPRECATEDDLL_OBJECTS)
 	@%create $(OBJS)\deprecateddll.lbc
 	@%append $(OBJS)\deprecateddll.lbc option quiet
 	@%append $(OBJS)\deprecateddll.lbc name $^@
-	@%append $(OBJS)\deprecateddll.lbc option incremental
+	@%append $(OBJS)\deprecateddll.lbc option caseexact
 	@%append $(OBJS)\deprecateddll.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME)
 	@for %i in ($(DEPRECATEDDLL_OBJECTS)) do @%append $(OBJS)\deprecateddll.lbc file %i
-	@for %i in ( $(__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  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)) do @%append $(OBJS)\deprecateddll.lbc library %i
+	@for %i in ( $(__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  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p) ) do @%append $(OBJS)\deprecateddll.lbc library %i
 	@%append $(OBJS)\deprecateddll.lbc
 	@%append $(OBJS)\deprecateddll.lbc system nt_dll
 	wlink @$(OBJS)\deprecateddll.lbc