!ifeq SHARED 1
WXDLLFLAG = dll
!endif
-__DEBUGINFO_0 =
+EXTRALIBS_FOR_BASE =
+!ifeq MONOLITHIC 0
+EXTRALIBS_FOR_BASE =
+!endif
+!ifeq MONOLITHIC 1
+EXTRALIBS_FOR_BASE =
+!endif
+__WXLIB_NET_p =
+!ifeq MONOLITHIC 0
+__WXLIB_NET_p = &
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib
+!endif
+__test_gui___depname =
+!ifeq USE_GUI 1
+__test_gui___depname = $(OBJS)\test_gui.exe
+!endif
+__WXLIB_CORE_p =
+!ifeq MONOLITHIC 0
+__WXLIB_CORE_p = &
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib
+!endif
+__DEBUGINFO =
!ifeq BUILD debug
!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d2
+__DEBUGINFO = -d2
!endif
!endif
!ifeq BUILD release
!ifeq DEBUG_INFO default
-__DEBUGINFO_0 = -d0
+__DEBUGINFO = -d0
!endif
!endif
!ifeq DEBUG_INFO 0
-__DEBUGINFO_0 = -d0
+__DEBUGINFO = -d0
!endif
!ifeq DEBUG_INFO 1
-__DEBUGINFO_0 = -d2
+__DEBUGINFO = -d2
!endif
__DEBUGINFO_1 =
!ifeq BUILD debug
!ifeq DEBUG_INFO 1
__DEBUGINFO_1 = debug all
!endif
-__OPTIMIZEFLAG_2 =
+__OPTIMIZEFLAG =
!ifeq BUILD debug
-__OPTIMIZEFLAG_2 = -od
+__OPTIMIZEFLAG = -od
!endif
!ifeq BUILD release
-__OPTIMIZEFLAG_2 = -ot -ox
+__OPTIMIZEFLAG = -ot -ox
!endif
-__RUNTIME_LIBS_5 =
+__RUNTIME_LIBS =
!ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS_5 = -br
+__RUNTIME_LIBS = -br
!endif
!ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_5 =
+__RUNTIME_LIBS =
!endif
-__EXCEPTIONSFLAG_7 =
+__EXCEPTIONSFLAG =
!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_7 =
+__EXCEPTIONSFLAG =
!endif
!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_7 = -xs
-!endif
-__WXUNIV_DEFINE_p =
-!ifeq WXUNIV 1
-__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
-!endif
-__DEBUG_DEFINE_p =
-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
+__EXCEPTIONSFLAG = -xs
!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-__UNICODE_DEFINE_p =
-!ifeq UNICODE 1
-__UNICODE_DEFINE_p = -d_UNICODE
+LIBDIRNAME =
+!ifeq SHARED 0
+LIBDIRNAME = .\..\lib\wat_lib$(CFG)
!endif
-__DLLFLAG_p =
!ifeq SHARED 1
-__DLLFLAG_p = -dWXUSINGDLL
+LIBDIRNAME = .\..\lib\wat_dll$(CFG)
!endif
__WXLIB_BASE_p =
!ifeq MONOLITHIC 0
!endif
__LIB_TIFF_p =
!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
!endif
__LIB_JPEG_p =
!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!endif
__LIB_PNG_p =
!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG)$(WX_RELEASE_NODOT).lib
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
-LIBDIRNAME =
-!ifeq SHARED 0
-LIBDIRNAME = .\..\lib\wat_lib$(CFG)
+__WXUNIV_DEFINE_p =
+!ifeq WXUNIV 1
+__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
+!endif
+__DEBUG_DEFINE_p =
+!ifeq BUILD debug
+!ifeq DEBUG_FLAG default
+__DEBUG_DEFINE_p = -d__WXDEBUG__
+!endif
+!endif
+!ifeq DEBUG_FLAG 1
+__DEBUG_DEFINE_p = -d__WXDEBUG__
+!endif
+__UNICODE_DEFINE_p =
+!ifeq UNICODE 1
+__UNICODE_DEFINE_p = -d_UNICODE
!endif
+__DLLFLAG_p =
!ifeq SHARED 1
-LIBDIRNAME = .\..\lib\wat_dll$(CFG)
+__DLLFLAG_p = -dWXUSINGDLL
!endif
### Variables: ###
wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
SETUPHDIR = &
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-TEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) &
+TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
- -i=.\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) $(CPPUNIT_CFLAGS) &
- $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
+ -i=.\..\include -i=$(SETUPHDIR) -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
+ $(__DLLFLAG_p) $(CPPUNIT_CFLAGS) /fh=$(OBJS)\testprec_test.pch &
+ $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
TEST_OBJECTS = &
+ $(OBJS)\test_dummy.obj &
$(OBJS)\test_test.obj &
- $(OBJS)\test_main.obj &
- $(OBJS)\test_formatconverter.obj &
- $(OBJS)\test_regex.obj &
- $(OBJS)\test_wxregex.obj &
- $(OBJS)\test_fileconf.obj &
- $(OBJS)\test_filename.obj &
- $(OBJS)\test_filesys.obj &
+ $(OBJS)\test_archivetest.obj &
$(OBJS)\test_arrays.obj &
+ $(OBJS)\test_datetimetest.obj &
+ $(OBJS)\test_fileconftest.obj &
+ $(OBJS)\test_filenametest.obj &
+ $(OBJS)\test_filesystest.obj &
+ $(OBJS)\test_fontmaptest.obj &
+ $(OBJS)\test_formatconvertertest.obj &
$(OBJS)\test_hashes.obj &
- $(OBJS)\test_longlong.obj &
+ $(OBJS)\test_lists.obj &
+ $(OBJS)\test_longlongtest.obj &
+ $(OBJS)\test_mbconvtest.obj &
+ $(OBJS)\test_regextest.obj &
+ $(OBJS)\test_wxregextest.obj &
$(OBJS)\test_strings.obj &
$(OBJS)\test_stdstrings.obj &
$(OBJS)\test_unicode.obj &
$(OBJS)\test_crt.obj &
$(OBJS)\test_bstream.obj &
+ $(OBJS)\test_datastreamtest.obj &
$(OBJS)\test_ffilestream.obj &
$(OBJS)\test_filestream.obj &
$(OBJS)\test_memstream.obj &
$(OBJS)\test_sstream.obj &
+ $(OBJS)\test_textstreamtest.obj &
$(OBJS)\test_zlibstream.obj &
- $(OBJS)\test_fontmap.obj &
- $(OBJS)\test_datetime.obj
+ $(OBJS)\test_uris.obj
+TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) -bm $(__RUNTIME_LIBS) &
+ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
+ -i=.\..\include -i=$(SETUPHDIR) -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. &
+ $(__DLLFLAG_p) -i=.\..\samples -dNOPCH $(CPPUNIT_CFLAGS) &
+ /fh=$(OBJS)\testprec_test_gui.pch $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
+ $(CXXFLAGS)
+TEST_GUI_OBJECTS = &
+ $(OBJS)\test_gui_dummy.obj &
+ $(OBJS)\test_gui_test.obj &
+ $(OBJS)\test_gui_rect.obj
all : $(OBJS)
### Targets: ###
-all : .SYMBOLIC $(OBJS)\test.exe data
+all : .SYMBOLIC $(OBJS)\test.exe $(__test_gui___depname) data
clean : .SYMBOLIC
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(OBJS)\test.exe del $(OBJS)\test.exe
+ -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
$(OBJS)\test.exe : $(TEST_OBJECTS)
@%create $(OBJS)\test.lbc
@%append $(OBJS)\test.lbc option caseexact
@%append $(OBJS)\test.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS)
@for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i
- @for %i in ( $(__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 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 odbc32.lib) do @%append $(OBJS)\test.lbc library %i
+ @for %i in ( $(__WXLIB_NET_p) $(__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) 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 odbc32.lib) do @%append $(OBJS)\test.lbc library %i
@%append $(OBJS)\test.lbc
wlink @$(OBJS)\test.lbc
+!ifeq USE_GUI 1
+$(OBJS)\test_gui.exe : $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
+ @%create $(OBJS)\test_gui.lbc
+ @%append $(OBJS)\test_gui.lbc option quiet
+ @%append $(OBJS)\test_gui.lbc name $^@
+ @%append $(OBJS)\test_gui.lbc option caseexact
+ @%append $(OBJS)\test_gui.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) $(CPPUNIT_LIBS) system nt ref 'main_'
+ @for %i in ($(TEST_GUI_OBJECTS)) do @%append $(OBJS)\test_gui.lbc file %i
+ @for %i in ( $(__WXLIB_CORE_p) $(__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) 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 odbc32.lib ) do @%append $(OBJS)\test_gui.lbc library %i
+ @%append $(OBJS)\test_gui.lbc option resource=$(OBJS)\test_gui_sample.res
+ wlink @$(OBJS)\test_gui.lbc
+!endif
+
data : .SYMBOLIC
if not exist $(OBJS) mkdir $(OBJS)
for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
+$(OBJS)\test_dummy.obj : .AUTODEPEND .\dummy.cpp
+ $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
$(OBJS)\test_test.obj : .AUTODEPEND .\test.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
-$(OBJS)\test_main.obj : .AUTODEPEND .\mbconv\main.cpp
+$(OBJS)\test_archivetest.obj : .AUTODEPEND .\archive\archivetest.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
-$(OBJS)\test_formatconverter.obj : .AUTODEPEND .\formatconverter\formatconverter.cpp
+$(OBJS)\test_arrays.obj : .AUTODEPEND .\arrays\arrays.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
-$(OBJS)\test_regex.obj : .AUTODEPEND .\regex\regex.cpp
+$(OBJS)\test_datetimetest.obj : .AUTODEPEND .\datetime\datetimetest.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
-$(OBJS)\test_wxregex.obj : .AUTODEPEND .\regex\wxregex.cpp
+$(OBJS)\test_fileconftest.obj : .AUTODEPEND .\fileconf\fileconftest.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
-$(OBJS)\test_fileconf.obj : .AUTODEPEND .\fileconf\fileconf.cpp
+$(OBJS)\test_filenametest.obj : .AUTODEPEND .\filename\filenametest.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
-$(OBJS)\test_filename.obj : .AUTODEPEND .\filename\filename.cpp
+$(OBJS)\test_filesystest.obj : .AUTODEPEND .\filesys\filesystest.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
-$(OBJS)\test_filesys.obj : .AUTODEPEND .\filesys\filesys.cpp
+$(OBJS)\test_fontmaptest.obj : .AUTODEPEND .\fontmap\fontmaptest.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
-$(OBJS)\test_arrays.obj : .AUTODEPEND .\arrays\arrays.cpp
+$(OBJS)\test_formatconvertertest.obj : .AUTODEPEND .\formatconverter\formatconvertertest.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_hashes.obj : .AUTODEPEND .\hashes\hashes.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
-$(OBJS)\test_longlong.obj : .AUTODEPEND .\longlong\longlong.cpp
+$(OBJS)\test_lists.obj : .AUTODEPEND .\lists\lists.cpp
+ $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_longlongtest.obj : .AUTODEPEND .\longlong\longlongtest.cpp
+ $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_mbconvtest.obj : .AUTODEPEND .\mbconv\mbconvtest.cpp
+ $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_regextest.obj : .AUTODEPEND .\regex\regextest.cpp
+ $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_wxregextest.obj : .AUTODEPEND .\regex\wxregextest.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_strings.obj : .AUTODEPEND .\strings\strings.cpp
$(OBJS)\test_bstream.obj : .AUTODEPEND .\streams\bstream.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+$(OBJS)\test_datastreamtest.obj : .AUTODEPEND .\streams\datastreamtest.cpp
+ $(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
$(OBJS)\test_ffilestream.obj : .AUTODEPEND .\streams\ffilestream.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_sstream.obj : .AUTODEPEND .\streams\sstream.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
-$(OBJS)\test_zlibstream.obj : .AUTODEPEND .\streams\zlibstream.cpp
+$(OBJS)\test_textstreamtest.obj : .AUTODEPEND .\streams\textstreamtest.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
-$(OBJS)\test_fontmap.obj : .AUTODEPEND .\fontmap\fontmap.cpp
+$(OBJS)\test_zlibstream.obj : .AUTODEPEND .\streams\zlibstream.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
-$(OBJS)\test_datetime.obj : .AUTODEPEND .\datetime\datetime.cpp
+$(OBJS)\test_uris.obj : .AUTODEPEND .\uris\uris.cpp
$(CXX) -zq -fo=$^@ $(TEST_CXXFLAGS) $<
+
+$(OBJS)\test_gui_sample.res : .AUTODEPEND .\..\samples\sample.rc
+ wrc -q -ad -bt=nt -r -fo=$^@ -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\samples $<
+
+$(OBJS)\test_gui_dummy.obj : .AUTODEPEND .\dummy.cpp
+ $(CXX) -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
+$(OBJS)\test_gui_test.obj : .AUTODEPEND .\test.cpp
+ $(CXX) -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
+$(OBJS)\test_gui_rect.obj : .AUTODEPEND .\geometry\rect.cpp
+ $(CXX) -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
projects / wxWidgets.git / blobdiff