X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/edcccd84c367a8c4f737edecf92a7b3904e95266..13220cca727ed74c2998b4fb89a4d80aacf28e68:/tests/makefile.gcc

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index 8a59317f66..9240dcb628 100644
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -12,6 +12,7 @@ include ../build/msw/config.gcc
 
 ### Variables: ###
 
+WX_RELEASE_NODOT = 25
 OBJS = \
 	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 SETUPHDIR = \
@@ -22,14 +23,18 @@ TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \
 	$(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS)
 TEST_OBJECTS =  \
 	$(OBJS)\test_test.o \
-	$(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_datetime.o \
+	$(OBJS)\test_fileconf.o \
+	$(OBJS)\test_filename.o \
+	$(OBJS)\test_filesys.o \
+	$(OBJS)\test_fontmap.o \
+	$(OBJS)\test_formatconverter.o \
 	$(OBJS)\test_hashes.o \
 	$(OBJS)\test_longlong.o \
+	$(OBJS)\test_main.o \
+	$(OBJS)\test_regex.o \
+	$(OBJS)\test_wxregex.o \
 	$(OBJS)\test_strings.o \
 	$(OBJS)\test_stdstrings.o \
 	$(OBJS)\test_unicode.o \
@@ -38,9 +43,9 @@ TEST_OBJECTS =  \
 	$(OBJS)\test_ffilestream.o \
 	$(OBJS)\test_filestream.o \
 	$(OBJS)\test_memstream.o \
+	$(OBJS)\test_sstream.o \
 	$(OBJS)\test_zlibstream.o \
-	$(OBJS)\test_fontmap.o \
-	$(OBJS)\test_datetime.o
+	$(OBJS)\test_uris.o
 
 ### Conditionally set variables: ###
 
@@ -70,6 +75,12 @@ endif
 ifeq ($(SHARED),1)
 WXDLLFLAG = dll
 endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
+endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
+endif
 ifeq ($(BUILD),debug)
 __OPTIMIZEFLAG_2 = -O0
 endif
@@ -106,11 +117,12 @@ ifeq ($(SHARED),1)
 __DLLFLAG_p = -DWXUSINGDLL
 endif
 ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+__WXLIB_BASE_p = \
+	-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
 endif
 ifeq ($(MONOLITHIC),1)
 __WXLIB_MONO_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
 endif
 ifeq ($(USE_GUI),1)
 __LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
@@ -161,7 +173,7 @@ clean:
 	-if exist $(OBJS)\test.exe del $(OBJS)\test.exe
 
 $(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
+	$(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) $(EXTRALIBS_FOR_BASE) $(__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)
@@ -170,22 +182,25 @@ data:
 $(OBJS)\test_test.o: ./test.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
-$(OBJS)\test_main.o: ./mbconv/main.cpp
+$(OBJS)\test_arrays.o: ./arrays/arrays.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
-$(OBJS)\test_formatconverter.o: ./formatconverter/formatconverter.cpp
+$(OBJS)\test_datetime.o: ./datetime/datetime.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
-$(OBJS)\test_regex.o: ./regex/regex.cpp
+$(OBJS)\test_fileconf.o: ./fileconf/fileconf.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
-$(OBJS)\test_wxregex.o: ./regex/wxregex.cpp
+$(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
+$(OBJS)\test_fontmap.o: ./fontmap/fontmap.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_formatconverter.o: ./formatconverter/formatconverter.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
 $(OBJS)\test_hashes.o: ./hashes/hashes.cpp
@@ -194,6 +209,15 @@ $(OBJS)\test_hashes.o: ./hashes/hashes.cpp
 $(OBJS)\test_longlong.o: ./longlong/longlong.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
+$(OBJS)\test_main.o: ./mbconv/main.cpp
+	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
+
+$(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_strings.o: ./strings/strings.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
@@ -218,13 +242,13 @@ $(OBJS)\test_filestream.o: ./streams/filestream.cpp
 $(OBJS)\test_memstream.o: ./streams/memstream.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
-$(OBJS)\test_zlibstream.o: ./streams/zlibstream.cpp
+$(OBJS)\test_sstream.o: ./streams/sstream.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
-$(OBJS)\test_fontmap.o: ./fontmap/fontmap.cpp
+$(OBJS)\test_zlibstream.o: ./streams/zlibstream.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
-$(OBJS)\test_datetime.o: ./datetime/datetime.cpp
+$(OBJS)\test_uris.o: ./uris/uris.cpp
 	$(CXX) -c -o $@ $(TEST_CXXFLAGS) $<
 
 .PHONY: all clean data