fix VC6 warnings

[wxWidgets.git] / tests / makefile.gcc

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index fa583a5f48596fb2881262e0ff57534afceef580..ef3d1d67c2a25904190886cb16ce8a238ddb2947 100644 (file)
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -14,9 +14,10 @@ include ../build/msw/config.gcc
 
 CPPDEPS = -MT$@ -MF$@.d -MD
 WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = gcc
 OBJS = \
-       gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
@@ -33,8 +34,9 @@ TEST_OBJECTS =  \
        $(OBJS)\test_ziptest.o \
        $(OBJS)\test_tartest.o \
        $(OBJS)\test_arrays.o \
+       $(OBJS)\test_base64.o \
+       $(OBJS)\test_fileconf.o \
        $(OBJS)\test_datetimetest.o \
-       $(OBJS)\test_fileconftest.o \
        $(OBJS)\test_filekind.o \
        $(OBJS)\test_filenametest.o \
        $(OBJS)\test_filesystest.o \
@@ -69,7 +71,9 @@ TEST_OBJECTS =  \
        $(OBJS)\test_textstreamtest.o \
        $(OBJS)\test_zlibstream.o \
        $(OBJS)\test_textfiletest.o \
-       $(OBJS)\test_uris.o
+       $(OBJS)\test_atomic.o \
+       $(OBJS)\test_uris.o \
+       $(OBJS)\test_vectors.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) \
@@ -83,7 +87,8 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_test.o \
        $(OBJS)\test_gui_rect.o \
        $(OBJS)\test_gui_size.o \
-       $(OBJS)\test_gui_point.o
+       $(OBJS)\test_gui_point.o \
+       $(OBJS)\test_gui_config.o
 PRINTFBENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
        $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
@@ -327,10 +332,13 @@ $(OBJS)\test_tartest.o: ./archive/tartest.cpp
 $(OBJS)\test_arrays.o: ./arrays/arrays.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\test_datetimetest.o: ./datetime/datetimetest.cpp
+$(OBJS)\test_base64.o: ./base64/base64.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\test_fileconftest.o: ./fileconf/fileconftest.cpp
+$(OBJS)\test_fileconf.o: ./config/fileconf.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_datetimetest.o: ./datetime/datetimetest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\test_filekind.o: ./filekind/filekind.cpp
@@ -435,9 +443,15 @@ $(OBJS)\test_zlibstream.o: ./streams/zlibstream.cpp
 $(OBJS)\test_textfiletest.o: ./textfile/textfiletest.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_atomic.o: ./thread/atomic.cpp
+       $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_uris.o: ./uris/uris.cpp
        $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_vectors.o: ./vectors/vectors.cpp
+       $(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) $(__MSLU_DEFINE_p_3) $(__GFXCTX_DEFINE_p_3) --include-dir $(SETUPHDIR) --include-dir ./../include --include-dir . $(__DLLFLAG_p_3) --include-dir ./../samples --define NOPCH
 
@@ -456,6 +470,9 @@ $(OBJS)\test_gui_size.o: ./geometry/size.cpp
 $(OBJS)\test_gui_point.o: ./geometry/point.cpp
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
+$(OBJS)\test_gui_config.o: ./config/config.cpp
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\printfbench_dummy.o: ./dummy.cpp
        $(CXX) -c -o $@ $(PRINTFBENCH_CXXFLAGS) $(CPPDEPS) $<