From a0744a6b06587475603ac11b7deba10b9aa78e57 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Sun, 12 Dec 2004 12:35:45 +0000 Subject: [PATCH] added GUI test program git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30955 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- tests/Makefile.in | 94 +++++- tests/makefile.bcc | 97 ++++-- tests/makefile.gcc | 86 ++++-- tests/makefile.vc | 206 +++++++++---- tests/makefile.wat | 129 +++++--- tests/test.bkl | 22 +- tests/test.dsw | 32 +- tests/{test.dsp => test_test.dsp} | 4 +- tests/test_test_gui.dsp | 486 ++++++++++++++++++++++++++++++ 9 files changed, 1005 insertions(+), 151 deletions(-) rename tests/{test.dsp => test_test.dsp} (99%) create mode 100644 tests/test_test_gui.dsp diff --git a/tests/Makefile.in b/tests/Makefile.in index dfcee0b06a..0c051673c8 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -11,10 +11,13 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ INSTALL = @INSTALL@ EXEEXT = @EXEEXT@ +RESCOMP = @RESCOMP@ SETFILE = @SETFILE@ +NM = @NM@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ top_builddir = @top_builddir@ +LDFLAGS_GUI = @LDFLAGS_GUI@ CXX = @CXX@ CXXFLAGS = @CXXFLAGS@ CPPFLAGS = @CPPFLAGS@ @@ -25,6 +28,7 @@ CPPUNIT_LIBS = @CPPUNIT_LIBS@ TOOLKIT = @TOOLKIT@ TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@ TOOLKIT_VERSION = @TOOLKIT_VERSION@ +TOOLCHAIN_NAME = @TOOLCHAIN_NAME@ EXTRALIBS = @EXTRALIBS@ EXTRALIBS_GUI = @EXTRALIBS_GUI@ HOST_SUFFIX = @HOST_SUFFIX@ @@ -35,6 +39,7 @@ SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@ DESTDIR = WX_RELEASE = 2.5 +WX_VERSION = $(WX_RELEASE).3 LIBDIRNAME = $(top_builddir)lib TEST_CXXFLAGS = $(__test_PCH_INC) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \ -I$(srcdir) $(__DLLFLAG_p) $(CPPUNIT_CFLAGS) $(CPPFLAGS) $(CXXFLAGS) @@ -68,6 +73,14 @@ TEST_OBJECTS = \ test_zlibstream.o \ test_uris.o TEST_ODEP = $(___pch_testprec_test_testprec_h_gch___depname) +TEST_GUI_CXXFLAGS = $(__test_gui_PCH_INC) -D__WX$(TOOLKIT)__ \ + $(__WXUNIV_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../samples \ + $(CPPUNIT_CFLAGS) $(CPPFLAGS) $(CXXFLAGS) +TEST_GUI_OBJECTS = \ + $(__test_gui___win32rc) \ + $(__test_gui_os2_lib_res) \ + test_gui_test.o +TEST_GUI_ODEP = $(___pch_testprec_test_gui_testprec_h_gch___depname) ### Conditionally set variables: ### @@ -82,16 +95,48 @@ TEST_ODEP = $(___pch_testprec_test_testprec_h_gch___depname) @COND_WXUNIV_1@WXUNIVNAME = univ @COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS) @COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI) +@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI) +@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = @COND_PLATFORM_MAC_1@__test___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL test$(EXEEXT) -@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ -@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL @COND_GCC_PCH_1@__test_PCH_INC = -I.pch/testprec_test @COND_GCC_PCH_1@___pch_testprec_test_testprec_h_gch___depname \ @COND_GCC_PCH_1@ = .pch/testprec_test/testprec.h.gch COND_MONOLITHIC_0___WXLIB_NET_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_NET_p = $(COND_MONOLITHIC_0___WXLIB_NET_p) +@COND_USE_GUI_1@__test_gui___depname = test_gui$(EXEEXT) +@COND_PLATFORM_MAC_1@__test_gui___mac_setfilecmd = \ +@COND_PLATFORM_MAC_1@ $(SETFILE) -a C test_gui$(EXEEXT) +@COND_PLATFORM_MAC_1@__test_gui___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_4 = -d __WXUNIVERSAL__ +@COND_WXUNIV_1@__WXUNIV_DEFINE_p_5 = --define __WXUNIVERSAL__ +@COND_SHARED_1@__DLLFLAG_p_4 = -d WXUSINGDLL +@COND_SHARED_1@__DLLFLAG_p_5 = --define WXUSINGDLL +COND_PLATFORM_OS2_1___test_gui___os2_emxbindcmd = $(NM) test_gui$(EXEEXT) | if \ + grep -q pmwin.763 ; then emxbind -ep test_gui$(EXEEXT) ; fi +@COND_PLATFORM_OS2_1@__test_gui___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___test_gui___os2_emxbindcmd) +@COND_PLATFORM_WIN32_1@__test_gui___win32rc = test_gui_sample_rc.o +@COND_PLATFORM_OS2_1@__test_gui_os2_lib_res = \ +@COND_PLATFORM_OS2_1@ $(top_srcdir)/include/wx/os2/wx.res +@COND_PLATFORM_MACOSX_1@__test_gui_bundle___depname = test_gui_bundle +@COND_TOOLKIT_COCOA@____test_gui_BUNDLE_TGT_REF_DEP = \ +@COND_TOOLKIT_COCOA@ test_gui.app/Contents/PkgInfo +@COND_TOOLKIT_MAC@____test_gui_BUNDLE_TGT_REF_DEP = \ +@COND_TOOLKIT_MAC@ test_gui.app/Contents/PkgInfo +@COND_GCC_PCH_1@__test_gui_PCH_INC = -I.pch/testprec_test_gui +@COND_GCC_PCH_1@___pch_testprec_test_gui_testprec_h_gch___depname \ +@COND_GCC_PCH_1@ = .pch/testprec_test_gui/testprec.h.gch +COND_MONOLITHIC_0___WXLIB_CORE_p = \ + -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX) +@COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p) +COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \ + __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_4) -i $(srcdir) $(__DLLFLAG_p_4) -i \ + $(srcdir)/../samples -i $(top_srcdir)/include -o test_gui$(EXEEXT) Carbon.r \ + $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r +@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1) +@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ +@COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL COND_MONOLITHIC_0___WXLIB_BASE_p = \ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX) @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p) @@ -119,7 +164,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \ ### Targets: ### -all: test$(EXEEXT) data +all: test$(EXEEXT) $(__test_gui___depname) $(__test_gui_bundle___depname) data install: all @@ -131,6 +176,8 @@ clean: rm -rf ./.deps ./.pch rm -f ./*.o rm -f test$(EXEEXT) + rm -f test_gui$(EXEEXT) + rm -rf test_gui.app distclean: clean rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile @@ -144,6 +191,39 @@ test$(EXEEXT): $(TEST_OBJECTS) @COND_GCC_PCH_1@.pch/testprec_test/testprec.h.gch: @COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/testprec_test/testprec.h.gch testprec.h $(CXX) $(TEST_CXXFLAGS) +@COND_USE_GUI_1@test_gui$(EXEEXT): $(TEST_GUI_OBJECTS) $(__test_gui___win32rc) +@COND_USE_GUI_1@ $(CXX) -o $@ $(TEST_GUI_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(EXTRALIBS_FOR_GUI) +@COND_USE_GUI_1@ $(__test_gui___mac_rezcmd) +@COND_USE_GUI_1@ $(__test_gui___mac_setfilecmd) +@COND_USE_GUI_1@ $(__test_gui___os2_emxbindcmd) +@COND_USE_GUI_1@ $(SAMPLES_RPATH_POSTLINK) + +test_gui.app/Contents/PkgInfo: $(__test_gui___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns + mkdir -p test_gui.app/Contents + mkdir -p test_gui.app/Contents/MacOS + mkdir -p test_gui.app/Contents/Resources + + + sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \ + -e "s/EXECUTABLE/test_gui/" \ + -e "s/VERSION/$(WX_VERSION)/" \ + $(top_srcdir)/src/mac/carbon/Info.plist.in >test_gui.app/Contents/Info.plist + + + echo -n "APPL????" >test_gui.app/Contents/PkgInfo + + + ln -f test_gui$(EXEEXT) test_gui.app/Contents/MacOS/test_gui + + + cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc test_gui.app/Contents/Resources/test_gui.rsrc + cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns test_gui.app/Contents/Resources/wxmac.icns + +@COND_PLATFORM_MACOSX_1@test_gui_bundle: $(____test_gui_BUNDLE_TGT_REF_DEP) + +@COND_GCC_PCH_1@.pch/testprec_test_gui/testprec.h.gch: +@COND_GCC_PCH_1@ $(top_builddir)./bk-make-pch .pch/testprec_test_gui/testprec.h.gch testprec.h $(CXX) $(TEST_GUI_CXXFLAGS) + data: @mkdir -p . @for f in testdata.fc; do \ @@ -236,8 +316,14 @@ test_zlibstream.o: $(srcdir)/streams/zlibstream.cpp $(TEST_ODEP) test_uris.o: $(srcdir)/uris/uris.cpp $(TEST_ODEP) $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $< +test_gui_sample_rc.o: $(srcdir)/../samples/sample.rc $(TEST_GUI_ODEP) + $(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_5) --include-dir $(srcdir) $(__DLLFLAG_p_5) --include-dir $(srcdir)/../samples --include-dir $(top_srcdir)/include + +test_gui_test.o: $(srcdir)/test.cpp $(TEST_GUI_ODEP) + $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $< + # Include dependency info, if present: @IF_GNU_MAKE@-include .deps/*.d -.PHONY: all install uninstall clean distclean data +.PHONY: all install uninstall clean distclean test_gui_bundle data diff --git a/tests/makefile.bcc b/tests/makefile.bcc index aee62dd9ba..b1782cbe14 100644 --- a/tests/makefile.bcc +++ b/tests/makefile.bcc @@ -26,11 +26,10 @@ OBJS = \ bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEST_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \ - $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\include -I$(SETUPHDIR) -I. \ - $(__DLLFLAG_p) $(CPPUNIT_CFLAGS) -Hu -H=$(OBJS)\testprec_test.csm \ - $(CPPFLAGS) $(CXXFLAGS) +TEST_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \ + $(CPPUNIT_CFLAGS) -Hu -H=$(OBJS)\testprec_test.csm $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = \ $(OBJS)\test_dummy.obj \ $(OBJS)\test_test.obj \ @@ -61,6 +60,14 @@ TEST_OBJECTS = \ $(OBJS)\test_textstreamtest.obj \ $(OBJS)\test_zlibstream.obj \ $(OBJS)\test_uris.obj +TEST_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \ + $(__OPTIMIZEFLAG) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \ + -I.\..\samples -DNOPCH $(CPPUNIT_CFLAGS) -Hu \ + -H=$(OBJS)\testprec_test_gui.csm $(CPPFLAGS) $(CXXFLAGS) +TEST_GUI_OBJECTS = \ + $(OBJS)\test_gui_dummy.obj \ + $(OBJS)\test_gui_test.obj ### Conditionally set variables: ### @@ -91,23 +98,49 @@ EXTRALIBS_FOR_BASE = !if "$(MONOLITHIC)" == "1" EXTRALIBS_FOR_BASE = !endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_NET_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif +!if "$(USE_GUI)" == "1" +__test_gui___depname = $(OBJS)\test_gui.exe +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_3 = -d__WXUNIVERSAL__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p_3 = -d__WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p_3 = -d__WXDEBUG__ +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_3 = -d_UNICODE +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_3 = -dWXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib +!endif !if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_2 = -Od +__OPTIMIZEFLAG = -Od !endif !if "$(BUILD)" == "release" -__OPTIMIZEFLAG_2 = -O2 +__OPTIMIZEFLAG = -O2 !endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_6 = -tWR +__RUNTIME_LIBS = -tWR !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_6 = +__RUNTIME_LIBS = !endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_7 = i +__RUNTIME_LIBS_0 = i !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_7 = +__RUNTIME_LIBS_0 = !endif !if "$(WXUNIV)" == "1" __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -121,12 +154,14 @@ __DEBUG_DEFINE_p = -D__WXDEBUG__ !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = -D_UNICODE !endif +!if "$(SHARED)" == "0" +LIBDIRNAME = .\..\lib\bcc_lib$(CFG) +!endif !if "$(SHARED)" == "1" -__DLLFLAG_p = -DWXUSINGDLL +LIBDIRNAME = .\..\lib\bcc_dll$(CFG) !endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_NET_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!if "$(SHARED)" == "1" +__DLLFLAG_p = -DWXUSINGDLL !endif !if "$(MONOLITHIC)" == "0" __WXLIB_BASE_p = \ @@ -148,12 +183,6 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !if "$(MSLU)" == "1" __UNICOWS_LIB_p = unicows.lib !endif -!if "$(SHARED)" == "0" -LIBDIRNAME = .\..\lib\bcc_lib$(CFG) -!endif -!if "$(SHARED)" == "1" -LIBDIRNAME = .\..\lib\bcc_dll$(CFG) -!endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" __DEBUGINFO = -v !endif @@ -174,7 +203,7 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\test.exe data +all: $(OBJS)\test.exe $(__test_gui___depname) data clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -185,11 +214,24 @@ clean: -if exist $(OBJS)\test.ild del $(OBJS)\test.ild -if exist $(OBJS)\test.ilf del $(OBJS)\test.ilf -if exist $(OBJS)\test.ils del $(OBJS)\test.ils + -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe + -if exist $(OBJS)\test_gui.tds del $(OBJS)\test_gui.tds + -if exist $(OBJS)\test_gui.ilc del $(OBJS)\test_gui.ilc + -if exist $(OBJS)\test_gui.ild del $(OBJS)\test_gui.ild + -if exist $(OBJS)\test_gui.ilf del $(OBJS)\test_gui.ilf + -if exist $(OBJS)\test_gui.ils del $(OBJS)\test_gui.ils $(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS) ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) @&&| - c0x32.obj $(TEST_OBJECTS),$@,, $(__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) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, + c0x32.obj $(TEST_OBJECTS),$@,, $(__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) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32mt$(__RUNTIME_LIBS_0).lib,, +| + +!if "$(USE_GUI)" == "1" +$(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res + ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -aa $(CPPUNIT_LIBS) @&&| + c0w32.obj $(TEST_GUI_OBJECTS),$@,, $(__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) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32mt$(__RUNTIME_LIBS_0).lib,, $(OBJS)\test_gui_sample.res | +!endif data: if not exist $(OBJS) mkdir $(OBJS) @@ -281,3 +323,12 @@ $(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp $(OBJS)\test_uris.obj: .\uris\uris.cpp $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) $** + +$(OBJS)\test_gui_sample.res: .\..\samples\sample.rc + brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) -i.\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_3) -i.\..\samples $** + +$(OBJS)\test_gui_dummy.obj: .\dummy.cpp + $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) -H $** + +$(OBJS)\test_gui_test.obj: .\test.cpp + $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) $** diff --git a/tests/makefile.gcc b/tests/makefile.gcc index 97037089ba..a8f767650e 100644 --- a/tests/makefile.gcc +++ b/tests/makefile.gcc @@ -17,10 +17,10 @@ OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) -DHAVE_W32API_H \ +TEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \ -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \ -I.\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) $(CPPUNIT_CFLAGS) \ - $(__EXCEPTIONSFLAG_4) $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = \ $(OBJS)\test_dummy.o \ $(OBJS)\test_test.o \ @@ -51,6 +51,15 @@ TEST_OBJECTS = \ $(OBJS)\test_textstreamtest.o \ $(OBJS)\test_zlibstream.o \ $(OBJS)\test_uris.o +TEST_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \ + -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) -I.\..\include -I$(SETUPHDIR) -Wall -I. $(__DLLFLAG_p) \ + -I.\..\samples -DNOPCH $(CPPUNIT_CFLAGS) $(__EXCEPTIONSFLAG) \ + $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS) +TEST_GUI_OBJECTS = \ + $(OBJS)\test_gui_sample_rc.o \ + $(OBJS)\test_gui_dummy.o \ + $(OBJS)\test_gui_test.o ### Conditionally set variables: ### @@ -86,23 +95,51 @@ endif ifeq ($(MONOLITHIC),1) EXTRALIBS_FOR_BASE = endif +ifeq ($(MONOLITHIC),0) +__WXLIB_NET_p = \ + -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net +endif +ifeq ($(USE_GUI),1) +__test_gui___depname = $(OBJS)\test_gui.exe +endif +ifeq ($(WXUNIV),1) +__WXUNIV_DEFINE_p_3 = --define __WXUNIVERSAL__ +endif ifeq ($(BUILD),debug) -__OPTIMIZEFLAG_2 = -O0 +ifeq ($(DEBUG_FLAG),default) +__DEBUG_DEFINE_p_3 = --define __WXDEBUG__ +endif +endif +ifeq ($(DEBUG_FLAG),1) +__DEBUG_DEFINE_p_3 = --define __WXDEBUG__ +endif +ifeq ($(UNICODE),1) +__UNICODE_DEFINE_p_3 = --define _UNICODE +endif +ifeq ($(SHARED),1) +__DLLFLAG_p_3 = --define WXUSINGDLL +endif +ifeq ($(MONOLITHIC),0) +__WXLIB_CORE_p = \ + -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core +endif +ifeq ($(BUILD),debug) +__OPTIMIZEFLAG = -O0 endif ifeq ($(BUILD),release) -__OPTIMIZEFLAG_2 = -O2 +__OPTIMIZEFLAG = -O2 endif ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONSFLAG_4 = -fno-rtti +__EXCEPTIONSFLAG = -fno-rtti endif ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG_4 = +__EXCEPTIONSFLAG = endif ifeq ($(USE_EXCEPTIONS),0) -__EXCEPTIONSFLAG_5 = -fno-exceptions +__EXCEPTIONSFLAG_0 = -fno-exceptions endif ifeq ($(USE_EXCEPTIONS),1) -__EXCEPTIONSFLAG_5 = +__EXCEPTIONSFLAG_0 = endif ifeq ($(WXUNIV),1) __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @@ -118,12 +155,14 @@ endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p = -D_UNICODE endif +ifeq ($(SHARED),0) +LIBDIRNAME = .\..\lib\gcc_lib$(CFG) +endif ifeq ($(SHARED),1) -__DLLFLAG_p = -DWXUSINGDLL +LIBDIRNAME = .\..\lib\gcc_dll$(CFG) endif -ifeq ($(MONOLITHIC),0) -__WXLIB_NET_p = \ - -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net +ifeq ($(SHARED),1) +__DLLFLAG_p = -DWXUSINGDLL endif ifeq ($(MONOLITHIC),0) __WXLIB_BASE_p = \ @@ -145,12 +184,6 @@ endif ifeq ($(MSLU),1) __UNICOWS_LIB_p = -lunicows endif -ifeq ($(SHARED),0) -LIBDIRNAME = .\..\lib\gcc_lib$(CFG) -endif -ifeq ($(SHARED),1) -LIBDIRNAME = .\..\lib\gcc_dll$(CFG) -endif ifeq ($(BUILD),debug) ifeq ($(DEBUG_INFO),default) __DEBUGINFO = -g @@ -175,15 +208,21 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\test.exe data +all: $(OBJS)\test.exe $(__test_gui___depname) data clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -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) $(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(__WXLIB_NET_p) $(__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 +ifeq ($(USE_GUI),1) +$(OBJS)\test_gui.exe: $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample_rc.o + $(CXX) -o $@ $(TEST_GUI_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(CPPUNIT_LIBS) $(__WXLIB_CORE_p) $(__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 +endif + data: if not exist $(OBJS) mkdir $(OBJS) for %%f in (testdata.fc) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS) @@ -275,4 +314,13 @@ $(OBJS)\test_zlibstream.o: ./streams/zlibstream.cpp $(OBJS)\test_uris.o: ./uris/uris.cpp $(CXX) -c -o $@ $(TEST_CXXFLAGS) $< +$(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) $(__UNICODE_DEFINE_p_3) --include-dir ./../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_3) --include-dir ./../samples + +$(OBJS)\test_gui_dummy.o: ./dummy.cpp + $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $< + +$(OBJS)\test_gui_test.o: ./test.cpp + $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $< + .PHONY: all clean data diff --git a/tests/makefile.vc b/tests/makefile.vc index a9d584d762..895f6c7689 100644 --- a/tests/makefile.vc +++ b/tests/makefile.vc @@ -17,13 +17,12 @@ OBJS = \ vc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) SETUPHDIR = \ $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG) -TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_7)$(__DEBUGRUNTIME_3) /DWIN32 \ - $(__DEBUGINFO_0) /Fd$(OBJS)\test.pdb $(____DEBUGRUNTIME_2_p) \ - $(__OPTIMIZEFLAG_4) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ - $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\include /I$(SETUPHDIR) /W4 \ - /I. $(__DLLFLAG_p) /D_CONSOLE $(CPPUNIT_CFLAGS) $(__EXCEPTIONSFLAG_8) \ - $(__EXCEPTIONSFLAG_9) /Yu"testprec.h" /Fp"$(OBJS)\testprec_test.pch" \ - $(CPPFLAGS) $(CXXFLAGS) +TEST_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_3) /DWIN32 $(__DEBUGINFO) \ + /Fd$(OBJS)\test.pdb $(____DEBUGRUNTIME_2_p) $(__OPTIMIZEFLAG) \ + $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ + $(__UNICODE_DEFINE_p) /I.\..\include /I$(SETUPHDIR) /W4 /I. $(__DLLFLAG_p) \ + /D_CONSOLE $(CPPUNIT_CFLAGS) $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \ + /Yu"testprec.h" /Fp"$(OBJS)\testprec_test.pch" $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = \ $(OBJS)\test_dummy.obj \ $(OBJS)\test_test.obj \ @@ -54,6 +53,17 @@ TEST_OBJECTS = \ $(OBJS)\test_textstreamtest.obj \ $(OBJS)\test_zlibstream.obj \ $(OBJS)\test_uris.obj +TEST_GUI_CXXFLAGS = /M$(__RUNTIME_LIBS)$(__DEBUGRUNTIME_17) /DWIN32 \ + $(__DEBUGINFO) /Fd$(OBJS)\test_gui.pdb $(____DEBUGRUNTIME_16_p) \ + $(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \ + $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) /I.\..\include /I$(SETUPHDIR) /W4 \ + /I. $(__DLLFLAG_p) /D_WINDOWS /I.\..\samples /DNOPCH $(CPPUNIT_CFLAGS) \ + $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) /Yu"testprec.h" \ + /Fp"$(OBJS)\testprec_test_gui.pch" $(CPPFLAGS) $(CXXFLAGS) +TEST_GUI_OBJECTS = \ + $(OBJS)\test_gui_sample.res \ + $(OBJS)\test_gui_dummy.obj \ + $(OBJS)\test_gui_test.obj ### Conditionally set variables: ### @@ -84,95 +94,166 @@ EXTRALIBS_FOR_BASE = !if "$(MONOLITHIC)" == "1" EXTRALIBS_FOR_BASE = !endif -!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = /Zi +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_2_p = !endif -!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_0 = +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_2_p = /D_DEBUG !endif -!if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_0 = +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_2_p = $(____DEBUGINFO) !endif -!if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_0 = /Zi +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +__DEBUGRUNTIME_3 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +__DEBUGRUNTIME_3 = d +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +__DEBUGRUNTIME_3 = $(__DEBUGINFO_2) +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_NET_p = \ + wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!endif +!if "$(USE_GUI)" == "1" +__test_gui___depname = $(OBJS)\test_gui.exe +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_16_p = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_16_p = /D_DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_16_p = $(____DEBUGINFO) +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "0" +____DEBUGRUNTIME_16_p_1 = +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "1" +____DEBUGRUNTIME_16_p_1 = /d _DEBUG +!endif +!if "$(DEBUG_RUNTIME_LIBS)" == "default" +____DEBUGRUNTIME_16_p_1 = $(____DEBUGINFO_16_p_1) !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = /DEBUG +____DEBUGINFO_16_p_1 = /d _DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_1 = +____DEBUGINFO_16_p_1 = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_1 = +____DEBUGINFO_16_p_1 = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_1 = /DEBUG +____DEBUGINFO_16_p_1 = /d _DEBUG !endif !if "$(DEBUG_RUNTIME_LIBS)" == "0" -____DEBUGRUNTIME_2_p = +__DEBUGRUNTIME_17 = !endif !if "$(DEBUG_RUNTIME_LIBS)" == "1" -____DEBUGRUNTIME_2_p = /D_DEBUG +__DEBUGRUNTIME_17 = d !endif !if "$(DEBUG_RUNTIME_LIBS)" == "default" -____DEBUGRUNTIME_2_p = $(____DEBUGINFO_2_p) +__DEBUGRUNTIME_17 = $(__DEBUGINFO_2) +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" +__NO_VC_CRTDBG_p_3 = /d __NO_VC_CRTDBG__ +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_FLAG)" == "1" +__NO_VC_CRTDBG_p_3 = /d __NO_VC_CRTDBG__ +!endif +!if "$(WXUNIV)" == "1" +__WXUNIV_DEFINE_p_3 = /d __WXUNIVERSAL__ +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default" +__DEBUG_DEFINE_p_3 = /d __WXDEBUG__ +!endif +!if "$(DEBUG_FLAG)" == "1" +__DEBUG_DEFINE_p_3 = /d __WXDEBUG__ +!endif +!if "$(UNICODE)" == "1" +__UNICODE_DEFINE_p_3 = /d _UNICODE +!endif +!if "$(SHARED)" == "1" +__DLLFLAG_p_3 = /d WXUSINGDLL +!endif +!if "$(MONOLITHIC)" == "0" +__WXLIB_CORE_p = \ + wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -____DEBUGINFO_2_p = /D_DEBUG +__DEBUGINFO = /Zi !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -____DEBUGINFO_2_p = +__DEBUGINFO = !endif !if "$(DEBUG_INFO)" == "0" -____DEBUGINFO_2_p = +__DEBUGINFO = !endif !if "$(DEBUG_INFO)" == "1" -____DEBUGINFO_2_p = /D_DEBUG +__DEBUGINFO = /Zi !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "0" -__DEBUGRUNTIME_3 = +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = /DEBUG !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "1" -__DEBUGRUNTIME_3 = d +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_1 = !endif -!if "$(DEBUG_RUNTIME_LIBS)" == "default" -__DEBUGRUNTIME_3 = $(__DEBUGINFO_3) +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_1 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_1 = /DEBUG !endif !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_3 = d +____DEBUGINFO = /D_DEBUG !endif !if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" -__DEBUGINFO_3 = +____DEBUGINFO = !endif !if "$(DEBUG_INFO)" == "0" -__DEBUGINFO_3 = +____DEBUGINFO = !endif !if "$(DEBUG_INFO)" == "1" -__DEBUGINFO_3 = d +____DEBUGINFO = /D_DEBUG +!endif +!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = d +!endif +!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "0" +__DEBUGINFO_2 = +!endif +!if "$(DEBUG_INFO)" == "1" +__DEBUGINFO_2 = d !endif !if "$(BUILD)" == "debug" -__OPTIMIZEFLAG_4 = /Od +__OPTIMIZEFLAG = /Od !endif !if "$(BUILD)" == "release" -__OPTIMIZEFLAG_4 = /O2 +__OPTIMIZEFLAG = /O2 !endif !if "$(RUNTIME_LIBS)" == "dynamic" -__RUNTIME_LIBS_7 = D +__RUNTIME_LIBS = D !endif !if "$(RUNTIME_LIBS)" == "static" -__RUNTIME_LIBS_7 = T +__RUNTIME_LIBS = T !endif !if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_8 = +__EXCEPTIONSFLAG = !endif !if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_8 = /GR +__EXCEPTIONSFLAG = /GR !endif !if "$(USE_EXCEPTIONS)" == "0" -__EXCEPTIONSFLAG_9 = +__EXCEPTIONSFLAG_0 = !endif !if "$(USE_EXCEPTIONS)" == "1" -__EXCEPTIONSFLAG_9 = /GX +__EXCEPTIONSFLAG_0 = /GX !endif !if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "0" __NO_VC_CRTDBG_p = /D__NO_VC_CRTDBG__ @@ -192,12 +273,14 @@ __DEBUG_DEFINE_p = /D__WXDEBUG__ !if "$(UNICODE)" == "1" __UNICODE_DEFINE_p = /D_UNICODE !endif +!if "$(SHARED)" == "0" +LIBDIRNAME = .\..\lib\vc_lib$(CFG) +!endif !if "$(SHARED)" == "1" -__DLLFLAG_p = /DWXUSINGDLL +LIBDIRNAME = .\..\lib\vc_dll$(CFG) !endif -!if "$(MONOLITHIC)" == "0" -__WXLIB_NET_p = \ - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +!if "$(SHARED)" == "1" +__DLLFLAG_p = /DWXUSINGDLL !endif !if "$(MONOLITHIC)" == "0" __WXLIB_BASE_p = \ @@ -219,12 +302,6 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib !if "$(MSLU)" == "1" __UNICOWS_LIB_p = unicows.lib !endif -!if "$(SHARED)" == "0" -LIBDIRNAME = .\..\lib\vc_lib$(CFG) -!endif -!if "$(SHARED)" == "1" -LIBDIRNAME = .\..\lib\vc_dll$(CFG) -!endif all: $(OBJS) @@ -233,7 +310,7 @@ $(OBJS): ### Targets: ### -all: $(OBJS)\test.exe data +all: $(OBJS)\test.exe $(__test_gui___depname) data clean: -if exist $(OBJS)\*.obj del $(OBJS)\*.obj @@ -241,12 +318,22 @@ clean: -if exist $(OBJS)\test.exe del $(OBJS)\test.exe -if exist $(OBJS)\test.ilk del $(OBJS)\test.ilk -if exist $(OBJS)\test.pdb del $(OBJS)\test.pdb + -if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe + -if exist $(OBJS)\test_gui.ilk del $(OBJS)\test_gui.ilk + -if exist $(OBJS)\test_gui.pdb del $(OBJS)\test_gui.pdb $(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS) link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) @<< $(TEST_OBJECTS) $(__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) $(__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 << +!if "$(USE_GUI)" == "1" +$(OBJS)\test_gui.exe: $(OBJS)\test_gui_dummy.obj $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res + link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS $(CPPUNIT_LIBS) @<< + $(TEST_GUI_OBJECTS) $(__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) $(__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 +<< +!endif + data: if not exist $(OBJS) mkdir $(OBJS) for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS) @@ -337,3 +424,12 @@ $(OBJS)\test_zlibstream.obj: .\streams\zlibstream.cpp $(OBJS)\test_uris.obj: .\uris\uris.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) $** + +$(OBJS)\test_gui_sample.res: .\..\samples\sample.rc + rc /fo$@ /d WIN32 $(____DEBUGRUNTIME_16_p_1) $(__NO_VC_CRTDBG_p_3) /d __WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) /i .\..\include /i $(SETUPHDIR) /i . $(__DLLFLAG_p_3) /d _WINDOWS /i .\..\samples $** + +$(OBJS)\test_gui_dummy.obj: .\dummy.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) /Yctestprec.h $** + +$(OBJS)\test_gui_test.obj: .\test.cpp + $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) $** diff --git a/tests/makefile.wat b/tests/makefile.wat index f84db85232..7ca23cfd62 100644 --- a/tests/makefile.wat +++ b/tests/makefile.wat @@ -62,22 +62,36 @@ EXTRALIBS_FOR_BASE = !ifeq MONOLITHIC 1 EXTRALIBS_FOR_BASE = !endif -__DEBUGINFO_0 = +__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 @@ -96,52 +110,33 @@ __DEBUGINFO_1 = !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 +__EXCEPTIONSFLAG = -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 -!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 -!endif -__WXLIB_NET_p = -!ifeq MONOLITHIC 0 -__WXLIB_NET_p = & - wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib +LIBDIRNAME = .\..\lib\wat_dll$(CFG) !endif __WXLIB_BASE_p = !ifeq MONOLITHIC 0 @@ -165,12 +160,26 @@ __LIB_PNG_p = !ifeq USE_GUI 1 __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: ### @@ -180,11 +189,11 @@ OBJS = & 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) -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. & $(__DLLFLAG_p) $(CPPUNIT_CFLAGS) /fh=$(OBJS)\testprec_test.pch & - $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS) + $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS) TEST_OBJECTS = & $(OBJS)\test_dummy.obj & $(OBJS)\test_test.obj & @@ -215,6 +224,15 @@ TEST_OBJECTS = & $(OBJS)\test_textstreamtest.obj & $(OBJS)\test_zlibstream.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 all : $(OBJS) @@ -223,7 +241,7 @@ $(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 @@ -231,6 +249,7 @@ clean : .SYMBOLIC -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 @@ -243,6 +262,19 @@ $(OBJS)\test.exe : $(TEST_OBJECTS) @%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) system nt_win ref '_WinMain@16' $(CPPUNIT_LIBS) + @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) @@ -333,3 +365,12 @@ $(OBJS)\test_zlibstream.obj : .AUTODEPEND .\streams\zlibstream.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) $< diff --git a/tests/test.bkl b/tests/test.bkl index 24dce9b863..ebd6befb9c 100644 --- a/tests/test.bkl +++ b/tests/test.bkl @@ -5,9 +5,10 @@ - - + + test.cpp archive/archivetest.cpp @@ -51,6 +55,18 @@ net base + + + + + test.cpp + + core + base + + testdata.fc diff --git a/tests/test.dsw b/tests/test.dsw index 1aca67e163..f50953cc64 100644 --- a/tests/test.dsw +++ b/tests/test.dsw @@ -2,7 +2,7 @@ Microsoft Developer Studio Workspace File, Format Version 6.00 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! ############################################################################### -Project: "test"=test.dsp - Package Owner=<4> +Project: "test"=test_test.dsp - Package Owner=<4> Package=<5> {{{ @@ -20,6 +20,24 @@ End Project Dependency ############################################################################### +Project: "test_gui"=test_test_gui.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +Begin Project Dependency +Project_Dep_Name core +End Project Dependency +Begin Project Dependency +Project_Dep_Name base +End Project Dependency +}}} + +############################################################################### + Project: "net"=..\build\msw\wx_net.dsp - Package Owner=<4> Package=<5> @@ -44,3 +62,15 @@ Package=<4> ############################################################################### +Project: "core"=..\build\msw\wx_core.dsp - Package Owner=<4> + +Package=<5> +{{{ +}}} + +Package=<4> +{{{ +}}} + +############################################################################### + diff --git a/tests/test.dsp b/tests/test_test.dsp similarity index 99% rename from tests/test.dsp rename to tests/test_test.dsp index 29d99106e6..6bf974d9c1 100644 --- a/tests/test.dsp +++ b/tests/test_test.dsp @@ -8,12 +8,12 @@ CFG=test - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run !MESSAGE -!MESSAGE NMAKE /f "test.mak". +!MESSAGE NMAKE /f "test_test.mak". !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: !MESSAGE -!MESSAGE NMAKE /f "test.mak" CFG="test - Win32 Debug" +!MESSAGE NMAKE /f "test_test.mak" CFG="test - Win32 Debug" !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE diff --git a/tests/test_test_gui.dsp b/tests/test_test_gui.dsp new file mode 100644 index 0000000000..904924f405 --- /dev/null +++ b/tests/test_test_gui.dsp @@ -0,0 +1,486 @@ +# Microsoft Developer Studio Project File - Name="test_gui" - Package Owner=<4> +# Microsoft Developer Studio Generated Build File, Format Version 6.00 +# ** DO NOT EDIT ** + +# TARGTYPE "Win32 (x86) Application" 0x0101 + +CFG=test_gui - Win32 Debug +!MESSAGE This is not a valid makefile. To build this project using NMAKE, +!MESSAGE use the Export Makefile command and run +!MESSAGE +!MESSAGE NMAKE /f "test_test_gui.mak". +!MESSAGE +!MESSAGE You can specify a configuration when running NMAKE +!MESSAGE by defining the macro CFG on the command line. For example: +!MESSAGE +!MESSAGE NMAKE /f "test_test_gui.mak" CFG="test_gui - Win32 Debug" +!MESSAGE +!MESSAGE Possible choices for configuration are: +!MESSAGE +!MESSAGE "test_gui - Win32 DLL Universal Unicode Release" (based on "Win32 (x86) Application") +!MESSAGE "test_gui - Win32 DLL Universal Unicode Debug" (based on "Win32 (x86) Application") +!MESSAGE "test_gui - Win32 DLL Universal Release" (based on "Win32 (x86) Application") +!MESSAGE "test_gui - Win32 DLL Universal Debug" (based on "Win32 (x86) Application") +!MESSAGE "test_gui - Win32 DLL Unicode Release" (based on "Win32 (x86) Application") +!MESSAGE "test_gui - Win32 DLL Unicode Debug" (based on "Win32 (x86) Application") +!MESSAGE "test_gui - Win32 DLL Release" (based on "Win32 (x86) Application") +!MESSAGE "test_gui - Win32 DLL Debug" (based on "Win32 (x86) Application") +!MESSAGE "test_gui - Win32 Universal Unicode Release" (based on "Win32 (x86) Application") +!MESSAGE "test_gui - Win32 Universal Unicode Debug" (based on "Win32 (x86) Application") +!MESSAGE "test_gui - Win32 Universal Release" (based on "Win32 (x86) Application") +!MESSAGE "test_gui - Win32 Universal Debug" (based on "Win32 (x86) Application") +!MESSAGE "test_gui - Win32 Unicode Release" (based on "Win32 (x86) Application") +!MESSAGE "test_gui - Win32 Unicode Debug" (based on "Win32 (x86) Application") +!MESSAGE "test_gui - Win32 Release" (based on "Win32 (x86) Application") +!MESSAGE "test_gui - Win32 Debug" (based on "Win32 (x86) Application") +!MESSAGE + +# Begin Project +# PROP AllowPerConfigDependencies 0 +# PROP Scc_ProjName "" +# PROP Scc_LocalPath "" +CPP=cl.exe +MTL=midl.exe +RSC=rc.exe + +!IF "$(CFG)" == "test_gui - Win32 DLL Universal Unicode Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswunivudll" +# PROP BASE Intermediate_Dir "vc_mswunivudll\test_gui" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswunivudll" +# PROP Intermediate_Dir "vc_mswunivudll\test_gui" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivudll\test_gui.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswunivu" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswunivudll\test_gui.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswunivu" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_dll\mswunivu" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\samples" /d NOPCH +# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_dll\mswunivu" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\test_gui.exe" /libpath:".\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmswuniv25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivudll\test_gui.exe" /libpath:".\..\lib\vc_dll" /subsystem:windows + +!ELSEIF "$(CFG)" == "test_gui - Win32 DLL Universal Unicode Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswunivuddll" +# PROP BASE Intermediate_Dir "vc_mswunivuddll\test_gui" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswunivuddll" +# PROP Intermediate_Dir "vc_mswunivuddll\test_gui" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\test_gui.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswunivud" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivuddll\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivuddll\test_gui.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswunivud" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivuddll\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_dll\mswunivud" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\samples" /d NOPCH +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_dll\mswunivud" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\test_gui.exe" /debug /libpath:".\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmswuniv25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivuddll\test_gui.exe" /debug /libpath:".\..\lib\vc_dll" /subsystem:windows + +!ELSEIF "$(CFG)" == "test_gui - Win32 DLL Universal Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswunivdll" +# PROP BASE Intermediate_Dir "vc_mswunivdll\test_gui" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswunivdll" +# PROP Intermediate_Dir "vc_mswunivdll\test_gui" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivdll\test_gui.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswuniv" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivdll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswunivdll\test_gui.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswuniv" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivdll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\include" /i ".\..\lib\vc_dll\mswuniv" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\samples" /d NOPCH +# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\include" /i ".\..\lib\vc_dll\mswuniv" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\test_gui.exe" /libpath:".\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmswuniv25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivdll\test_gui.exe" /libpath:".\..\lib\vc_dll" /subsystem:windows + +!ELSEIF "$(CFG)" == "test_gui - Win32 DLL Universal Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswunivddll" +# PROP BASE Intermediate_Dir "vc_mswunivddll\test_gui" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswunivddll" +# PROP Intermediate_Dir "vc_mswunivddll\test_gui" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\test_gui.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswunivd" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivddll\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivddll\test_gui.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswunivd" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivddll\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\include" /i ".\..\lib\vc_dll\mswunivd" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\samples" /d NOPCH +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\include" /i ".\..\lib\vc_dll\mswunivd" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\test_gui.exe" /debug /libpath:".\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmswuniv25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivddll\test_gui.exe" /debug /libpath:".\..\lib\vc_dll" /subsystem:windows + +!ELSEIF "$(CFG)" == "test_gui - Win32 DLL Unicode Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswudll" +# PROP BASE Intermediate_Dir "vc_mswudll\test_gui" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswudll" +# PROP Intermediate_Dir "vc_mswudll\test_gui" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswudll\test_gui.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswu" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswudll\test_gui.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswu" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswudll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_dll\mswu" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\samples" /d NOPCH +# ADD RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_dll\mswu" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\test_gui.exe" /libpath:".\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmsw25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswudll\test_gui.exe" /libpath:".\..\lib\vc_dll" /subsystem:windows + +!ELSEIF "$(CFG)" == "test_gui - Win32 DLL Unicode Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswuddll" +# PROP BASE Intermediate_Dir "vc_mswuddll\test_gui" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswuddll" +# PROP Intermediate_Dir "vc_mswuddll\test_gui" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\test_gui.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswud" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswuddll\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswuddll\test_gui.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswud" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswuddll\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_dll\mswud" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\samples" /d NOPCH +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_dll\mswud" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\test_gui.exe" /debug /libpath:".\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmsw25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuddll\test_gui.exe" /debug /libpath:".\..\lib\vc_dll" /subsystem:windows + +!ELSEIF "$(CFG)" == "test_gui - Win32 DLL Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswdll" +# PROP BASE Intermediate_Dir "vc_mswdll\test_gui" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswdll" +# PROP Intermediate_Dir "vc_mswdll\test_gui" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswdll\test_gui.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\msw" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswdll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswdll\test_gui.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\msw" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswdll\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\include" /i ".\..\lib\vc_dll\msw" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\samples" /d NOPCH +# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\include" /i ".\..\lib\vc_dll\msw" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\test_gui.exe" /libpath:".\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmsw25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswdll\test_gui.exe" /libpath:".\..\lib\vc_dll" /subsystem:windows + +!ELSEIF "$(CFG)" == "test_gui - Win32 DLL Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswddll" +# PROP BASE Intermediate_Dir "vc_mswddll\test_gui" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswddll" +# PROP Intermediate_Dir "vc_mswddll\test_gui" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\test_gui.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswd" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswddll\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswddll\test_gui.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_dll\mswd" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswddll\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "WXUSINGDLL" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\include" /i ".\..\lib\vc_dll\mswd" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\samples" /d NOPCH +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\include" /i ".\..\lib\vc_dll\mswd" /i "." /d "WXUSINGDLL" /d "_WINDOWS" /i ".\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\test_gui.exe" /debug /libpath:".\..\lib\vc_dll" /subsystem:windows +# ADD LINK32 wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswddll\test_gui.exe" /debug /libpath:".\..\lib\vc_dll" /subsystem:windows + +!ELSEIF "$(CFG)" == "test_gui - Win32 Universal Unicode Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswunivu" +# PROP BASE Intermediate_Dir "vc_mswunivu\test_gui" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswunivu" +# PROP Intermediate_Dir "vc_mswunivu\test_gui" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswunivu\test_gui.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswunivu" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswunivu\test_gui.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswunivu" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_lib\mswunivu" /i "." /d "_WINDOWS" /i ".\..\samples" /d NOPCH +# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_lib\mswunivu" /i "." /d "_WINDOWS" /i ".\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\test_gui.exe" /libpath:".\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmswuniv25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivu\test_gui.exe" /libpath:".\..\lib\vc_lib" /subsystem:windows + +!ELSEIF "$(CFG)" == "test_gui - Win32 Universal Unicode Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswunivud" +# PROP BASE Intermediate_Dir "vc_mswunivud\test_gui" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswunivud" +# PROP Intermediate_Dir "vc_mswunivud\test_gui" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\test_gui.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswunivud" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivud\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivud\test_gui.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswunivud" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivud\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_lib\mswunivud" /i "." /d "_WINDOWS" /i ".\..\samples" /d NOPCH +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_lib\mswunivud" /i "." /d "_WINDOWS" /i ".\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\test_gui.exe" /debug /libpath:".\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmswuniv25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivud\test_gui.exe" /debug /libpath:".\..\lib\vc_lib" /subsystem:windows + +!ELSEIF "$(CFG)" == "test_gui - Win32 Universal Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswuniv" +# PROP BASE Intermediate_Dir "vc_mswuniv\test_gui" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswuniv" +# PROP Intermediate_Dir "vc_mswuniv\test_gui" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswuniv\test_gui.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswuniv" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswuniv\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswuniv\test_gui.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswuniv" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswuniv\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\include" /i ".\..\lib\vc_lib\mswuniv" /i "." /d "_WINDOWS" /i ".\..\samples" /d NOPCH +# ADD RSC /l 0x405 /d "__WXMSW__" /d "__WXUNIVERSAL__" /i ".\..\include" /i ".\..\lib\vc_lib\mswuniv" /i "." /d "_WINDOWS" /i ".\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\test_gui.exe" /libpath:".\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmswuniv25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswuniv\test_gui.exe" /libpath:".\..\lib\vc_lib" /subsystem:windows + +!ELSEIF "$(CFG)" == "test_gui - Win32 Universal Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswunivd" +# PROP BASE Intermediate_Dir "vc_mswunivd\test_gui" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswunivd" +# PROP Intermediate_Dir "vc_mswunivd\test_gui" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\test_gui.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswunivd" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivd\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswunivd\test_gui.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswunivd" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswunivd\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXUNIVERSAL__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\include" /i ".\..\lib\vc_lib\mswunivd" /i "." /d "_WINDOWS" /i ".\..\samples" /d NOPCH +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXUNIVERSAL__" /d "__WXDEBUG__" /i ".\..\include" /i ".\..\lib\vc_lib\mswunivd" /i "." /d "_WINDOWS" /i ".\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmswuniv25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\test_gui.exe" /debug /libpath:".\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmswuniv25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswunivd\test_gui.exe" /debug /libpath:".\..\lib\vc_lib" /subsystem:windows + +!ELSEIF "$(CFG)" == "test_gui - Win32 Unicode Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_mswu" +# PROP BASE Intermediate_Dir "vc_mswu\test_gui" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_mswu" +# PROP Intermediate_Dir "vc_mswu\test_gui" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Fdvc_mswu\test_gui.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswu" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Fdvc_mswu\test_gui.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswu" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswu\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_lib\mswu" /i "." /d "_WINDOWS" /i ".\..\samples" /d NOPCH +# ADD RSC /l 0x405 /d "__WXMSW__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_lib\mswu" /i "." /d "_WINDOWS" /i ".\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\test_gui.exe" /libpath:".\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmsw25u_core.lib wxbase25u.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregexu.lib wxexpat.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswu\test_gui.exe" /libpath:".\..\lib\vc_lib" /subsystem:windows + +!ELSEIF "$(CFG)" == "test_gui - Win32 Unicode Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswud" +# PROP BASE Intermediate_Dir "vc_mswud\test_gui" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswud" +# PROP Intermediate_Dir "vc_mswud\test_gui" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\test_gui.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswud" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswud\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswud\test_gui.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswud" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswud\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_UNICODE" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_lib\mswud" /i "." /d "_WINDOWS" /i ".\..\samples" /d NOPCH +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /d "_UNICODE" /i ".\..\include" /i ".\..\lib\vc_lib\mswud" /i "." /d "_WINDOWS" /i ".\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\test_gui.exe" /debug /libpath:".\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmsw25ud_core.lib wxbase25ud.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexud.lib wxexpatd.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswud\test_gui.exe" /debug /libpath:".\..\lib\vc_lib" /subsystem:windows + +!ELSEIF "$(CFG)" == "test_gui - Win32 Release" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 0 +# PROP BASE Output_Dir "vc_msw" +# PROP BASE Intermediate_Dir "vc_msw\test_gui" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 0 +# PROP Output_Dir "vc_msw" +# PROP Intermediate_Dir "vc_msw\test_gui" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MD /Fdvc_msw\test_gui.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\msw" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_msw\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MD /Fdvc_msw\test_gui.pdb /O1 /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\msw" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_msw\testprec_test_gui.pch" /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "__WXMSW__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "__WXMSW__" /i ".\..\include" /i ".\..\lib\vc_lib\msw" /i "." /d "_WINDOWS" /i ".\..\samples" /d NOPCH +# ADD RSC /l 0x405 /d "__WXMSW__" /i ".\..\include" /i ".\..\lib\vc_lib\msw" /i "." /d "_WINDOWS" /i ".\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\test_gui.exe" /libpath:".\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmsw25_core.lib wxbase25.lib wxtiff.lib wxjpeg.lib wxpng.lib wxzlib.lib wxregex.lib wxexpat.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_msw\test_gui.exe" /libpath:".\..\lib\vc_lib" /subsystem:windows + +!ELSEIF "$(CFG)" == "test_gui - Win32 Debug" + +# PROP BASE Use_MFC 0 +# PROP BASE Use_Debug_Libraries 1 +# PROP BASE Output_Dir "vc_mswd" +# PROP BASE Intermediate_Dir "vc_mswd\test_gui" +# PROP BASE Target_Dir "" +# PROP Use_MFC 0 +# PROP Use_Debug_Libraries 1 +# PROP Output_Dir "vc_mswd" +# PROP Intermediate_Dir "vc_mswd\test_gui" +# PROP Target_Dir "" +# ADD BASE CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\test_gui.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswd" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswd\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c +# ADD CPP /nologo /FD /MDd /Zi /Gm /GZ /Fdvc_mswd\test_gui.pdb /Od /GR /GX /I ".\..\include" /I ".\..\lib\vc_lib\mswd" /W4 /I "." /I ".\..\samples" /Yu"testprec.h" /Fp"vc_mswd\testprec_test_gui.pch" /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /c +# ADD BASE MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD MTL /nologo /D "WIN32" /D "_DEBUG" /D "__WXMSW__" /D "__WXDEBUG__" /D "_WINDOWS" /D "NOPCH" /mktyplib203 /win32 +# ADD BASE RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\include" /i ".\..\lib\vc_lib\mswd" /i "." /d "_WINDOWS" /i ".\..\samples" /d NOPCH +# ADD RSC /l 0x405 /d "_DEBUG" /d "__WXMSW__" /d "__WXDEBUG__" /i ".\..\include" /i ".\..\lib\vc_lib\mswd" /i "." /d "_WINDOWS" /i ".\..\samples" /d NOPCH +BSC32=bscmake.exe +# ADD BASE BSC32 /nologo +# ADD BSC32 /nologo +LINK32=link.exe +# ADD BASE LINK32 wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\test_gui.exe" /debug /libpath:".\..\lib\vc_lib" /subsystem:windows +# ADD LINK32 wxmsw25d_core.lib wxbase25d.lib wxtiffd.lib wxjpegd.lib wxpngd.lib wxzlibd.lib wxregexd.lib wxexpatd.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 oleacc.lib odbc32.lib /nologo /machine:i386 /out:"vc_mswd\test_gui.exe" /debug /libpath:".\..\lib\vc_lib" /subsystem:windows + +!ENDIF + +# Begin Target + +# Name "test_gui - Win32 DLL Universal Unicode Release" +# Name "test_gui - Win32 DLL Universal Unicode Debug" +# Name "test_gui - Win32 DLL Universal Release" +# Name "test_gui - Win32 DLL Universal Debug" +# Name "test_gui - Win32 DLL Unicode Release" +# Name "test_gui - Win32 DLL Unicode Debug" +# Name "test_gui - Win32 DLL Release" +# Name "test_gui - Win32 DLL Debug" +# Name "test_gui - Win32 Universal Unicode Release" +# Name "test_gui - Win32 Universal Unicode Debug" +# Name "test_gui - Win32 Universal Release" +# Name "test_gui - Win32 Universal Debug" +# Name "test_gui - Win32 Unicode Release" +# Name "test_gui - Win32 Unicode Debug" +# Name "test_gui - Win32 Release" +# Name "test_gui - Win32 Debug" +# Begin Group "Source Files" + +# PROP Default_Filter "" +# Begin Source File + +SOURCE=.\dummy.cpp +# ADD BASE CPP /Yc"testprec.h" +# ADD CPP /Yc"testprec.h" +# End Source File +# Begin Source File + +SOURCE=.\..\samples\sample.rc +# End Source File +# Begin Source File + +SOURCE=.\test.cpp +# End Source File +# End Group +# End Target +# End Project + -- 2.45.2