Moved wxCFStringHolder and some other string functions to their own files.

[wxWidgets.git] / tests / makefile.vc

diff --git a/tests/makefile.vc b/tests/makefile.vc
index 2a2fca4ebe49203a11c2ec9d0feb4baf04766a37..660078934da36245d625c5499feb4abceaa7fea1 100644 (file)
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -25,16 +25,18 @@ TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \
        $(__EXCEPTIONSFLAG_9) $(CPPFLAGS) $(CXXFLAGS)
 TEST_OBJECTS =  \
        $(OBJS)\test_test.obj \
-       $(OBJS)\test_main.obj \
-       $(OBJS)\test_formatconverter.obj \
-       $(OBJS)\test_regex.obj \
-       $(OBJS)\test_wxregex.obj \
+       $(OBJS)\test_arrays.obj \
+       $(OBJS)\test_datetime.obj \
        $(OBJS)\test_fileconf.obj \
        $(OBJS)\test_filename.obj \
        $(OBJS)\test_filesys.obj \
-       $(OBJS)\test_arrays.obj \
+       $(OBJS)\test_fontmap.obj \
+       $(OBJS)\test_formatconverter.obj \
        $(OBJS)\test_hashes.obj \
        $(OBJS)\test_longlong.obj \
+       $(OBJS)\test_main.obj \
+       $(OBJS)\test_regex.obj \
+       $(OBJS)\test_wxregex.obj \
        $(OBJS)\test_strings.obj \
        $(OBJS)\test_stdstrings.obj \
        $(OBJS)\test_unicode.obj \
@@ -45,8 +47,7 @@ TEST_OBJECTS =  \
        $(OBJS)\test_memstream.obj \
        $(OBJS)\test_sstream.obj \
        $(OBJS)\test_zlibstream.obj \
-       $(OBJS)\test_fontmap.obj \
-       $(OBJS)\test_datetime.obj
+       $(OBJS)\test_uris.obj
 
 ### Conditionally set variables: ###
 
@@ -71,6 +72,12 @@ WXUNIVNAME = univ
 !if "$(SHARED)" == "1"
 WXDLLFLAG = dll
 !endif
+!if "$(MONOLITHIC)" == "0"
+EXTRALIBS_FOR_BASE = 
+!endif
+!if "$(MONOLITHIC)" == "1"
+EXTRALIBS_FOR_BASE =  
+!endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO_0 = /Zi
 !endif
@@ -191,13 +198,13 @@ __WXLIB_MONO_p = \
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
 !if "$(USE_GUI)" == "1"
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
 !endif
 !if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !endif
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib
@@ -227,7 +234,7 @@ clean:
 
 $(OBJS)\test.exe: $(TEST_OBJECTS)
        link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1)  /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) @<<
-       $(TEST_OBJECTS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib wxexpat$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib  $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib
+       $(TEST_OBJECTS)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib odbc32.lib
 <<
 
 data: 
@@ -237,16 +244,10 @@ data:
 $(OBJS)\test_test.obj: .\test.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
-$(OBJS)\test_main.obj: .\mbconv\main.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
-
-$(OBJS)\test_formatconverter.obj: .\formatconverter\formatconverter.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
-
-$(OBJS)\test_regex.obj: .\regex\regex.cpp
+$(OBJS)\test_arrays.obj: .\arrays\arrays.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
-$(OBJS)\test_wxregex.obj: .\regex\wxregex.cpp
+$(OBJS)\test_datetime.obj: .\datetime\datetime.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
 $(OBJS)\test_fileconf.obj: .\fileconf\fileconf.cpp
@@ -258,7 +259,10 @@ $(OBJS)\test_filename.obj: .\filename\filename.cpp
 $(OBJS)\test_filesys.obj: .\filesys\filesys.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
-$(OBJS)\test_arrays.obj: .\arrays\arrays.cpp
+$(OBJS)\test_fontmap.obj: .\fontmap\fontmap.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_formatconverter.obj: .\formatconverter\formatconverter.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
 $(OBJS)\test_hashes.obj: .\hashes\hashes.cpp
@@ -267,6 +271,15 @@ $(OBJS)\test_hashes.obj: .\hashes\hashes.cpp
 $(OBJS)\test_longlong.obj: .\longlong\longlong.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
+$(OBJS)\test_main.obj: .\mbconv\main.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_regex.obj: .\regex\regex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
+$(OBJS)\test_wxregex.obj: .\regex\wxregex.cpp
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
+
 $(OBJS)\test_strings.obj: .\strings\strings.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
@@ -297,8 +310,5 @@ $(OBJS)\test_sstream.obj: .\streams\sstream.cpp
 $(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
 
-$(OBJS)\test_fontmap.obj: .\fontmap\fontmap.cpp
-       $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**
-
-$(OBJS)\test_datetime.obj: .\datetime\datetime.cpp
+$(OBJS)\test_uris.obj: .\uris\uris.cpp
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $**