X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1cd53e884b78da17408bc80567574bb1c212a9a6..fdec2c055413ed1b39bd2df9979c6c04aa94fe28:/tests/makefile.gcc

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index 99f1ca299a..bd807991eb 100644
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -25,10 +25,12 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_main.o \
 	$(OBJS)\test_formatconverter.o \
 	$(OBJS)\test_regex.o \
+	$(OBJS)\test_wxregex.o \
 	$(OBJS)\test_filesys.o \
 	$(OBJS)\test_arrays.o \
 	$(OBJS)\test_longlong.o \
 	$(OBJS)\test_strings.o \
+	$(OBJS)\test_unicode.o \
 	$(OBJS)\test_bstream.o \
 	$(OBJS)\test_ffilestream.o \
 	$(OBJS)\test_filestream.o \
@@ -147,7 +149,7 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\test.exe
+all: $(OBJS)\test.exe data
 
 clean: 
 	-if exist $(OBJS)\*.o del $(OBJS)\*.o
@@ -156,6 +158,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) $<
 
@@ -168,6 +174,9 @@ $(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_filesys.o: ./filesys/filesys.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
@@ -180,6 +189,9 @@ $(OBJS)\test_longlong.o: ./longlong/longlong.cpp
 $(OBJS)\test_strings.o: ./strings/strings.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_unicode.o: ./strings/unicode.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
 $(OBJS)\test_bstream.o: ./streams/bstream.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
@@ -195,4 +207,4 @@ $(OBJS)\test_memstream.o: ./streams/memstream.cpp
 $(OBJS)\test_zlibstream.o: ./streams/zlibstream.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
-.PHONY: all clean
+.PHONY: all clean data