X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/98a50e202c83af50a5261c745bf74a0cafcab3b3..852a8f8b532510da1e0a4e802f8ef84a6217e7a3:/tests/makefile.wat

diff --git a/tests/makefile.wat b/tests/makefile.wat
index eb5a596026..2b5866d43c 100644
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.6 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -55,6 +55,13 @@ WXDLLFLAG =
 !ifeq SHARED 1
 WXDLLFLAG = dll
 !endif
+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif
 EXTRALIBS_FOR_BASE =
 !ifeq MONOLITHIC 0
 EXTRALIBS_FOR_BASE = 
@@ -129,14 +136,14 @@ __EXCEPTIONSFLAG =
 __EXCEPTIONSFLAG = 
 !endif
 !ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG = -xs
+__EXCEPTIONSFLAG = -xr
 !endif
-LIBDIRNAME =
-!ifeq SHARED 0
-LIBDIRNAME = .\..\lib\wat_lib$(CFG)
+__EXCEPTIONSFLAG_0 =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONSFLAG_0 = 
 !endif
-!ifeq SHARED 1
-LIBDIRNAME = .\..\lib\wat_dll$(CFG)
+!ifeq USE_EXCEPTIONS 1
+__EXCEPTIONSFLAG_0 = -xs
 !endif
 __WXLIB_BASE_p =
 !ifeq MONOLITHIC 0
@@ -187,20 +194,24 @@ __DLLFLAG_p = -dWXUSINGDLL
 WX_RELEASE_NODOT = 25
 OBJS = &
 	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = &
 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 	-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
-	-i=.\..\include -i=$(SETUPHDIR) -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
-	$(__DLLFLAG_p) $(CPPUNIT_CFLAGS) /fh=$(OBJS)\testprec_test.pch &
-	$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
+	-i=.\..\include -i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
+	$(__DLLFLAG_p) -dwxUSE_GUI=0 $(CPPUNIT_CFLAGS) &
+	/fh=$(OBJS)\testprec_test.pch $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) &
+	$(CPPFLAGS) $(CXXFLAGS)
 TEST_OBJECTS =  &
 	$(OBJS)\test_dummy.obj &
 	$(OBJS)\test_test.obj &
 	$(OBJS)\test_archivetest.obj &
+	$(OBJS)\test_ziptest.obj &
 	$(OBJS)\test_arrays.obj &
 	$(OBJS)\test_datetimetest.obj &
 	$(OBJS)\test_fileconftest.obj &
+	$(OBJS)\test_filekind.obj &
 	$(OBJS)\test_filenametest.obj &
 	$(OBJS)\test_filesystest.obj &
 	$(OBJS)\test_fontmaptest.obj &
@@ -219,6 +230,7 @@ TEST_OBJECTS =  &
 	$(OBJS)\test_datastreamtest.obj &
 	$(OBJS)\test_ffilestream.obj &
 	$(OBJS)\test_filestream.obj &
+	$(OBJS)\test_largefile.obj &
 	$(OBJS)\test_memstream.obj &
 	$(OBJS)\test_sstream.obj &
 	$(OBJS)\test_textstreamtest.obj &
@@ -226,14 +238,16 @@ TEST_OBJECTS =  &
 	$(OBJS)\test_uris.obj
 TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
 	-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
-	-i=.\..\include -i=$(SETUPHDIR) -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
+	-i=.\..\include -i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
 	$(__DLLFLAG_p) -i=.\..\samples -dNOPCH $(CPPUNIT_CFLAGS) &
-	/fh=$(OBJS)\testprec_test_gui.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
-	$(CXXFLAGS)
+	/fh=$(OBJS)\testprec_test_gui.pch $(__EXCEPTIONSFLAG) &
+	$(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
 TEST_GUI_OBJECTS =  &
 	$(OBJS)\test_gui_dummy.obj &
 	$(OBJS)\test_gui_test.obj &
-	$(OBJS)\test_gui_rect.obj
+	$(OBJS)\test_gui_rect.obj &
+	$(OBJS)\test_gui_size.obj &
+	$(OBJS)\test_gui_point.obj
 
 
 all : $(OBJS)
@@ -249,6 +263,7 @@ 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)\*.pch del $(OBJS)\*.pch
 	-if exist $(OBJS)\test.exe del $(OBJS)\test.exe
 	-if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
 
@@ -289,6 +304,9 @@ $(OBJS)\test_test.obj :  .AUTODEPEND .\test.cpp
 $(OBJS)\test_archivetest.obj :  .AUTODEPEND .\archive\archivetest.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_ziptest.obj :  .AUTODEPEND .\archive\ziptest.cpp
+	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_arrays.obj :  .AUTODEPEND .\arrays\arrays.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
@@ -298,6 +316,9 @@ $(OBJS)\test_datetimetest.obj :  .AUTODEPEND .\datetime\datetimetest.cpp
 $(OBJS)\test_fileconftest.obj :  .AUTODEPEND .\fileconf\fileconftest.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_filekind.obj :  .AUTODEPEND .\filekind\filekind.cpp
+	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_filenametest.obj :  .AUTODEPEND .\filename\filenametest.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
@@ -352,6 +373,9 @@ $(OBJS)\test_ffilestream.obj :  .AUTODEPEND .\streams\ffilestream.cpp
 $(OBJS)\test_filestream.obj :  .AUTODEPEND .\streams\filestream.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_largefile.obj :  .AUTODEPEND .\streams\largefile.cpp
+	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_memstream.obj :  .AUTODEPEND .\streams\memstream.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
@@ -368,7 +392,7 @@ $(OBJS)\test_uris.obj :  .AUTODEPEND .\uris\uris.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_gui_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 $<
+	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)\test_gui_dummy.obj :  .AUTODEPEND .\dummy.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
@@ -378,3 +402,10 @@ $(OBJS)\test_gui_test.obj :  .AUTODEPEND .\test.cpp
 
 $(OBJS)\test_gui_rect.obj :  .AUTODEPEND .\geometry\rect.cpp
 	$(CXX) -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
+$(OBJS)\test_gui_size.obj :  .AUTODEPEND .\geometry\size.cpp
+	$(CXX) -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
+$(OBJS)\test_gui_point.obj :  .AUTODEPEND .\geometry\point.cpp
+	$(CXX) -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+