X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1b035b8cd06269c196162ab4edc713b1709883d8..678666f2381592db7857772e35b5c0a39fc83f17:/tests/makefile.gcc

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index c4f0d33421..7d8bd8b5d3 100644
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -25,9 +25,23 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_main.o \
 	$(OBJS)\test_formatconverter.o \
 	$(OBJS)\test_regex.o \
+	$(OBJS)\test_wxregex.o \
+	$(OBJS)\test_filename.o \
 	$(OBJS)\test_filesys.o \
 	$(OBJS)\test_arrays.o \
-	$(OBJS)\test_longlong.o
+	$(OBJS)\test_hashes.o \
+	$(OBJS)\test_longlong.o \
+	$(OBJS)\test_strings.o \
+	$(OBJS)\test_stdstrings.o \
+	$(OBJS)\test_unicode.o \
+	$(OBJS)\test_crt.o \
+	$(OBJS)\test_bstream.o \
+	$(OBJS)\test_ffilestream.o \
+	$(OBJS)\test_filestream.o \
+	$(OBJS)\test_memstream.o \
+	$(OBJS)\test_zlibstream.o \
+	$(OBJS)\test_fontmap.o \
+	$(OBJS)\test_datetime.o
 
 ### Conditionally set variables: ###
 
@@ -141,7 +155,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\test.exe
+all: $(OBJS)\test.exe data
 
 clean: 
 	-if exist $(OBJS)\*.o del $(OBJS)\*.o
@@ -150,6 +164,10 @@ clean:
 $(OBJS)\test.exe: $(TEST_OBJECTS)
 	$(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME)  $(CPPUNIT_LIBS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32
 
+data: 
+	if not exist $(OBJS) mkdir $(OBJS)
+	for %%f in (testdata.fc) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
+
 $(OBJS)\test_test.o: ./test.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
@@ -162,13 +180,55 @@ $(OBJS)\test_formatconverter.o: ./formatconverter/formatconverter.cpp
 $(OBJS)\test_regex.o: ./regex/regex.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_wxregex.o: ./regex/wxregex.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_filename.o: ./filename/filename.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_filesys.o: ./filesys/filesys.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_arrays.o: ./arrays/arrays.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_hashes.o: ./hashes/hashes.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_longlong.o: ./longlong/longlong.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
-.PHONY: all clean
+$(OBJS)\test_strings.o: ./strings/strings.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_stdstrings.o: ./strings/stdstrings.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_unicode.o: ./strings/unicode.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_crt.o: ./strings/crt.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_bstream.o: ./streams/bstream.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_ffilestream.o: ./streams/ffilestream.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_filestream.o: ./streams/filestream.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_memstream.o: ./streams/memstream.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_zlibstream.o: ./streams/zlibstream.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_fontmap.o: ./fontmap/fontmap.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_datetime.o: ./datetime/datetime.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+.PHONY: all clean data