X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4818141bb228bbb59df63de12a5ea31801314b57..b836b6ea08c2cc7a22f1d44d88f0ce92ecc8a5a3:/tests/makefile.gcc?ds=sidebyside

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index e1d236fc74..b3283c6c45 100644
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -12,7 +12,8 @@ include ../build/msw/config.gcc
 
 ### Variables: ###
 
-WX_RELEASE_NODOT = 26
+CPPDEPS = -MT$@ -MF$@.d -MD
+WX_RELEASE_NODOT = 27
 OBJS = \
 	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = .\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
@@ -21,8 +22,8 @@ SETUPHDIR = \
 TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
 	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
 	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I.\..\include -I$(SETUPHDIR) -W -Wall -I. \
-	$(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(__RTTIFLAG) \
+	$(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\include -W \
+	-Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 $(CPPUNIT_CFLAGS) $(__RTTIFLAG) \
 	$(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 TEST_OBJECTS =  \
 	$(OBJS)\test_dummy.o \
@@ -40,11 +41,14 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_hashes.o \
 	$(OBJS)\test_lists.o \
 	$(OBJS)\test_longlongtest.o \
+	$(OBJS)\test_convautotest.o \
 	$(OBJS)\test_mbconvtest.o \
 	$(OBJS)\test_regextest.o \
 	$(OBJS)\test_wxregextest.o \
+	$(OBJS)\test_scopeguardtest.o \
 	$(OBJS)\test_strings.o \
 	$(OBJS)\test_stdstrings.o \
+	$(OBJS)\test_tokenizer.o \
 	$(OBJS)\test_unicode.o \
 	$(OBJS)\test_crt.o \
 	$(OBJS)\test_bstream.o \
@@ -57,14 +61,15 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_tempfile.o \
 	$(OBJS)\test_textstreamtest.o \
 	$(OBJS)\test_zlibstream.o \
+	$(OBJS)\test_textfiletest.o \
 	$(OBJS)\test_uris.o
 TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
 	$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
 	$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\include -I$(SETUPHDIR) -W \
-	-Wall -I. $(__DLLFLAG_p) -I.\..\samples -DNOPCH $(CPPUNIT_CFLAGS) \
-	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
-	$(CXXFLAGS)
+	$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+	-I$(SETUPHDIR) -I.\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\samples \
+	-DNOPCH $(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
+	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_sample_rc.o \
 	$(OBJS)\test_gui_dummy.o \
@@ -143,6 +148,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_3 = --define _UNICODE
 endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_3 = --define wxUSE_UNICODE_MSLU=1
+endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p_3 = --define WXUSINGDLL
 endif
@@ -191,6 +199,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -D_UNICODE
 endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p = -DWXUSINGDLL
 endif
@@ -248,6 +259,7 @@ all: $(OBJS)\test.exe $(__test_gui___depname) data
 
 clean: 
 	-if exist $(OBJS)\*.o del $(OBJS)\*.o
+	-if exist $(OBJS)\*.d del $(OBJS)\*.d
 	-if exist $(OBJS)\test.exe del $(OBJS)\test.exe
 	-if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
 
@@ -264,122 +276,136 @@ data:
 	for %%f in (testdata.fc) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
 $(OBJS)\test_dummy.o: ./dummy.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_test.o: ./test.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_archivetest.o: ./archive/archivetest.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_ziptest.o: ./archive/ziptest.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_arrays.o: ./arrays/arrays.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_datetimetest.o: ./datetime/datetimetest.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_fileconftest.o: ./fileconf/fileconftest.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_filekind.o: ./filekind/filekind.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_filenametest.o: ./filename/filenametest.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_filesystest.o: ./filesys/filesystest.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_fontmaptest.o: ./fontmap/fontmaptest.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_formatconvertertest.o: ./formatconverter/formatconvertertest.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_hashes.o: ./hashes/hashes.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_lists.o: ./lists/lists.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_longlongtest.o: ./longlong/longlongtest.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_convautotest.o: ./mbconv/convautotest.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_mbconvtest.o: ./mbconv/mbconvtest.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_regextest.o: ./regex/regextest.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_wxregextest.o: ./regex/wxregextest.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_scopeguardtest.o: ./scopeguard/scopeguardtest.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_strings.o: ./strings/strings.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_stdstrings.o: ./strings/stdstrings.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_tokenizer.o: ./strings/tokenizer.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_unicode.o: ./strings/unicode.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_crt.o: ./strings/crt.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_bstream.o: ./streams/bstream.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_datastreamtest.o: ./streams/datastreamtest.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_ffilestream.o: ./streams/ffilestream.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_filestream.o: ./streams/filestream.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_largefile.o: ./streams/largefile.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_memstream.o: ./streams/memstream.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_sstream.o: ./streams/sstream.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_tempfile.o: ./streams/tempfile.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_textstreamtest.o: ./streams/textstreamtest.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_zlibstream.o: ./streams/zlibstream.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_textfiletest.o: ./textfile/textfiletest.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_uris.o: ./uris/uris.cpp
-	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_gui_sample_rc.o: ./../samples/sample.rc
-	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) --include-dir ./../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_3) --include-dir ./../samples
+	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) --include-dir $(SETUPHDIR) --include-dir ./../include --include-dir . $(__DLLFLAG_p_3) --include-dir ./../samples
 
 $(OBJS)\test_gui_dummy.o: ./dummy.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_gui_test.o: ./test.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_gui_rect.o: ./geometry/rect.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_gui_size.o: ./geometry/size.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_gui_point.o: ./geometry/point.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $<
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
 .PHONY: all clean data
 
 
+# Dependencies tracking:
+-include $(OBJS)/*.d