Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commiting re-baked files after wxListCtrl OS X additions.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@41259 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Kevin Ollivier
2006-09-17 08:06:09 +00:00
parent 6a623422ec
commit c2c04edc2c
18 changed files with 361 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
tests/Makefile.in
View File

@@ -95,6 +95,13 @@ TEST_GUI_OBJECTS = \
test_gui_size.o \
test_gui_point.o
TEST_GUI_ODEP = $(___pch_testprec_test_gui_testprec_h_gch___depname)
PRINTFBENCH_CXXFLAGS = $(__printfbench_PCH_INC) -D__WX$(TOOLKIT)__ \
$(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) -I$(srcdir) $(__DLLFLAG_p) -DwxUSE_GUI=0 \
$(CPPUNIT_CFLAGS) $(CPPFLAGS) $(CXXFLAGS)
PRINTFBENCH_OBJECTS = \
printfbench_printfbench.o
PRINTFBENCH_ODEP = $(___pch_testprec_printfbench_testprec_h_gch___depname)
### Conditionally set variables: ###
@@ -163,6 +170,13 @@ COND_MONOLITHIC_0___WXLIB_CORE_p = \
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p \
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ = \
@COND_USE_GUI_1_WXUSE_LIBPNG_BUILTIN@ -lwxpng$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
@COND_PLATFORM_MAC_1@__printfbench___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL printfbench$(EXEEXT)
@COND_GCC_PCH_1@__printfbench_PCH_INC = -I.pch/testprec_printfbench
@COND_ICC_PCH_1@__printfbench_PCH_INC = -use_pch \
@COND_ICC_PCH_1@ .pch/testprec_printfbench/testprec.h.gch
@COND_USE_PCH_1@___pch_testprec_printfbench_testprec_h_gch___depname \
@COND_USE_PCH_1@ = .pch/testprec_printfbench/testprec.h.gch
COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_4) $(__EXCEPTIONS_DEFINE_p_4) \
$(__RTTI_DEFINE_p_4) $(__THREAD_DEFINE_p_4) -i $(srcdir) $(__DLLFLAG_p_4) -i \
@@ -192,7 +206,7 @@ COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
### Targets: ###
all: test$(EXEEXT) $(__test_gui___depname) $(__test_gui_bundle___depname) data
all: test$(EXEEXT) $(__test_gui___depname) $(__test_gui_bundle___depname) data printfbench$(EXEEXT)
install: all
@@ -206,6 +220,7 @@ clean:
rm -f test$(EXEEXT)
rm -f test_gui$(EXEEXT)
rm -rf test_gui.app
rm -f printfbench$(EXEEXT)
distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
@@ -262,6 +277,15 @@ data:
esac; \
done
printfbench$(EXEEXT): $(PRINTFBENCH_OBJECTS)
$(CXX) -o $@ $(PRINTFBENCH_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(SAMPLES_RPATH_FLAG) $(CPPUNIT_LIBS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE)
$(__printfbench___mac_setfilecmd)
$(SAMPLES_RPATH_POSTLINK)
@COND_USE_PCH_1@.pch/testprec_printfbench/testprec.h.gch:
@COND_USE_PCH_1@ $(top_builddir)./bk-make-pch .pch/testprec_printfbench/testprec.h.gch testprec.h $(CXX) $(PRINTFBENCH_CXXFLAGS)
test_test.o: $(srcdir)/test.cpp $(TEST_ODEP)
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/test.cpp
@@ -388,6 +412,9 @@ test_gui_size.o: $(srcdir)/geometry/size.cpp $(TEST_GUI_ODEP)
test_gui_point.o: $(srcdir)/geometry/point.cpp $(TEST_GUI_ODEP)
$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/geometry/point.cpp
printfbench_printfbench.o: $(srcdir)/benchmarks/printfbench.cpp $(PRINTFBENCH_ODEP)
$(CXXC) -c -o $@ $(PRINTFBENCH_CXXFLAGS) $(srcdir)/benchmarks/printfbench.cpp
# Include dependency info, if present:
@IF_GNU_MAKE@-include .deps/*.d

45
tests/makefile.bcc
View File

@@ -28,7 +28,7 @@ LIBDIRNAME = .\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
TEST_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG_1) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-I$(SETUPHDIR) -I.\..\include -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \
@@ -73,7 +73,7 @@ TEST_OBJECTS = \
$(OBJS)\test_textfiletest.obj \
$(OBJS)\test_uris.obj
TEST_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG_1) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-I$(SETUPHDIR) -I.\..\include -I. $(__DLLFLAG_p) -I.\..\samples -DNOPCH \
@@ -85,6 +85,16 @@ TEST_GUI_OBJECTS = \
$(OBJS)\test_gui_rect.obj \
$(OBJS)\test_gui_size.obj \
$(OBJS)\test_gui_point.obj
PRINTFBENCH_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \
$(__OPTIMIZEFLAG) $(__THREADSFLAG_1) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-I$(SETUPHDIR) -I.\..\include -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \
$(CPPUNIT_CFLAGS) -Hu -H=$(OBJS)\testprec_printfbench.csm $(CPPFLAGS) \
$(CXXFLAGS)
PRINTFBENCH_OBJECTS = \
$(OBJS)\printfbench_dummy.obj \
$(OBJS)\printfbench_printfbench.obj
### Conditionally set variables: ###
@@ -181,10 +191,10 @@ __THREADSFLAG =
__THREADSFLAG = mt
!endif
!if "$(USE_THREADS)" == "0"
__THREADSFLAG_0 =
__THREADSFLAG_1 =
!endif
!if "$(USE_THREADS)" == "1"
__THREADSFLAG_0 = -tWM
__THREADSFLAG_1 = -tWM
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS = -tWR
@@ -193,10 +203,10 @@ __RUNTIME_LIBS = -tWR
__RUNTIME_LIBS =
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS_0 = i
__RUNTIME_LIBS_1 = i
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_0 =
__RUNTIME_LIBS_1 =
!endif
!if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@@ -256,7 +266,7 @@ $(OBJS):
### Targets: ###
all: $(OBJS)\test.exe $(__test_gui___depname) data
all: $(OBJS)\test.exe $(__test_gui___depname) data $(OBJS)\printfbench.exe
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -274,16 +284,22 @@ clean:
-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
-if exist $(OBJS)\printfbench.exe del $(OBJS)\printfbench.exe
-if exist $(OBJS)\printfbench.tds del $(OBJS)\printfbench.tds
-if exist $(OBJS)\printfbench.ilc del $(OBJS)\printfbench.ilc
-if exist $(OBJS)\printfbench.ild del $(OBJS)\printfbench.ild
-if exist $(OBJS)\printfbench.ilf del $(OBJS)\printfbench.ilf
-if exist $(OBJS)\printfbench.ils del $(OBJS)\printfbench.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) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,,
c0x32.obj $(TEST_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_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 cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).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) $(CPPUNIT_LIBS) -ap @&&|
c0x32.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 cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\test_gui_sample.res
c0x32.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 cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,, $(OBJS)\test_gui_sample.res
|
!endif
@@ -291,6 +307,11 @@ data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
$(OBJS)\printfbench.exe: $(OBJS)\printfbench_dummy.obj $(PRINTFBENCH_OBJECTS)
ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(CPPUNIT_LIBS) @&&|
c0x32.obj $(PRINTFBENCH_OBJECTS),$@,, $(__WXLIB_BASE_p) $(__WXLIB_MONO_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 cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,,
|
$(OBJS)\test_dummy.obj: .\dummy.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) -H $**
@@ -423,3 +444,9 @@ $(OBJS)\test_gui_size.obj: .\geometry\size.cpp
$(OBJS)\test_gui_point.obj: .\geometry\point.cpp
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) $**
$(OBJS)\printfbench_dummy.obj: .\dummy.cpp
$(CXX) -q -c -P -o$@ $(PRINTFBENCH_CXXFLAGS) -H $**
$(OBJS)\printfbench_printfbench.obj: .\benchmarks\printfbench.cpp
$(CXX) -q -c -P -o$@ $(PRINTFBENCH_CXXFLAGS) $**

22
tests/makefile.gcc
View File

@@ -78,6 +78,16 @@ TEST_GUI_OBJECTS = \
$(OBJS)\test_gui_rect.o \
$(OBJS)\test_gui_size.o \
$(OBJS)\test_gui_point.o
PRINTFBENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \
$(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
-I$(SETUPHDIR) -I.\..\include -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \
$(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \
$(CPPFLAGS) $(CXXFLAGS)
PRINTFBENCH_OBJECTS = \
$(OBJS)\printfbench_dummy.o \
$(OBJS)\printfbench_printfbench.o
### Conditionally set variables: ###
@@ -256,13 +266,14 @@ $(OBJS):
### Targets: ###
all: $(OBJS)\test.exe $(__test_gui___depname) data
all: $(OBJS)\test.exe $(__test_gui___depname) data $(OBJS)\printfbench.exe
clean:
-if exist $(OBJS)\*.o del $(OBJS)\*.o
-if exist $(OBJS)\*.d del $(OBJS)\*.d
-if exist $(OBJS)\test.exe del $(OBJS)\test.exe
-if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
-if exist $(OBJS)\printfbench.exe del $(OBJS)\printfbench.exe
$(OBJS)\test.exe: $(TEST_OBJECTS)
$(CXX) -o $@ $(TEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_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
@@ -276,6 +287,9 @@ data:
if not exist $(OBJS) mkdir $(OBJS)
for %%f in (testdata.fc) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
$(OBJS)\printfbench.exe: $(PRINTFBENCH_OBJECTS)
$(CXX) -o $@ $(PRINTFBENCH_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(CPPUNIT_LIBS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_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
$(OBJS)\test_dummy.o: ./dummy.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
@@ -408,6 +422,12 @@ $(OBJS)\test_gui_size.o: ./geometry/size.cpp
$(OBJS)\test_gui_point.o: ./geometry/point.cpp
$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\printfbench_dummy.o: ./dummy.cpp
$(CXX) -c -o $@ $(PRINTFBENCH_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\printfbench_printfbench.o: ./benchmarks/printfbench.cpp
$(CXX) -c -o $@ $(PRINTFBENCH_CXXFLAGS) $(CPPDEPS) $<
.PHONY: all clean data

45
tests/makefile.vc
View File

@@ -80,6 +80,17 @@ TEST_GUI_OBJECTS = \
$(OBJS)\test_gui_rect.obj \
$(OBJS)\test_gui_size.obj \
$(OBJS)\test_gui_point.obj
PRINTFBENCH_CXXFLAGS = /M$(__RUNTIME_LIBS_38)$(__DEBUGRUNTIME) /DWIN32 \
$(__DEBUGINFO) /Fd$(OBJS)\printfbench.pdb $(____DEBUGRUNTIME) \
$(__OPTIMIZEFLAG) $(__NO_VC_CRTDBG_p) /D__WXMSW__ $(__WXUNIV_DEFINE_p) \
$(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
/I$(SETUPHDIR) /I.\..\include /W4 /I. $(__DLLFLAG_p) /D_CONSOLE /DwxUSE_GUI=0 \
$(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"testprec.h" \
/Fp"$(OBJS)\testprec_printfbench.pch" $(CPPFLAGS) $(CXXFLAGS)
PRINTFBENCH_OBJECTS = \
$(OBJS)\printfbench_dummy.obj \
$(OBJS)\printfbench_printfbench.obj
### Conditionally set variables: ###
@@ -217,6 +228,12 @@ __LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
!if "$(USE_GUI)" == "1"
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
!endif
!if "$(RUNTIME_LIBS)" == "dynamic"
__RUNTIME_LIBS_38 = D
!endif
!if "$(RUNTIME_LIBS)" == "static"
__RUNTIME_LIBS_38 = $(__THREADSFLAG)
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO = /Zi
!endif
@@ -230,16 +247,16 @@ __DEBUGINFO =
__DEBUGINFO = /Zi
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_1 = /DEBUG
__DEBUGINFO_2 = /DEBUG
!endif
!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
__DEBUGINFO_1 =
__DEBUGINFO_2 =
!endif
!if "$(DEBUG_INFO)" == "0"
__DEBUGINFO_1 =
__DEBUGINFO_2 =
!endif
!if "$(DEBUG_INFO)" == "1"
__DEBUGINFO_1 = /DEBUG
__DEBUGINFO_2 = /DEBUG
!endif
!if "$(BUILD)" == "debug" && "$(DEBUG_RUNTIME_LIBS)" == "default"
____DEBUGRUNTIME = /D_DEBUG
@@ -341,7 +358,7 @@ $(OBJS):
### Targets: ###
all: $(OBJS)\test.exe $(__test_gui___depname) data
all: $(OBJS)\test.exe $(__test_gui___depname) data $(OBJS)\printfbench.exe
clean:
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -353,15 +370,18 @@ clean:
-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
-if exist $(OBJS)\printfbench.exe del $(OBJS)\printfbench.exe
-if exist $(OBJS)\printfbench.ilk del $(OBJS)\printfbench.ilk
-if exist $(OBJS)\printfbench.pdb del $(OBJS)\printfbench.pdb
$(OBJS)\test.exe: $(OBJS)\test_dummy.obj $(TEST_OBJECTS)
link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) @<<
link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) @<<
$(TEST_OBJECTS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_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 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) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE @<<
link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) $(CPPUNIT_LIBS) /SUBSYSTEM:CONSOLE @<<
$(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 odbc32.lib
<<
!endif
@@ -370,6 +390,11 @@ data:
if not exist $(OBJS) mkdir $(OBJS)
for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
$(OBJS)\printfbench.exe: $(OBJS)\printfbench_dummy.obj $(PRINTFBENCH_OBJECTS)
link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_2) $(LINK_TARGET_CPU) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:CONSOLE $(CPPUNIT_LIBS) @<<
$(PRINTFBENCH_OBJECTS) $(__WXLIB_BASE_p) $(__WXLIB_MONO_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 odbc32.lib
<<
$(OBJS)\test_dummy.obj: .\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) /Yctestprec.h $**
@@ -502,3 +527,9 @@ $(OBJS)\test_gui_size.obj: .\geometry\size.cpp
$(OBJS)\test_gui_point.obj: .\geometry\point.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) $**
$(OBJS)\printfbench_dummy.obj: .\dummy.cpp
$(CXX) /c /nologo /TP /Fo$@ $(PRINTFBENCH_CXXFLAGS) /Yctestprec.h $**
$(OBJS)\printfbench_printfbench.obj: .\benchmarks\printfbench.cpp
$(CXX) /c /nologo /TP /Fo$@ $(PRINTFBENCH_CXXFLAGS) $**

65
tests/makefile.wat
View File

@@ -112,22 +112,22 @@ __DEBUGINFO = -d0
!ifeq DEBUG_INFO 1
__DEBUGINFO = -d2
!endif
__DEBUGINFO_1 =
__DEBUGINFO_2 =
!ifeq BUILD debug
!ifeq DEBUG_INFO default
__DEBUGINFO_1 = debug all
__DEBUGINFO_2 = debug all
!endif
!endif
!ifeq BUILD release
!ifeq DEBUG_INFO default
__DEBUGINFO_1 =
__DEBUGINFO_2 =
!endif
!endif
!ifeq DEBUG_INFO 0
__DEBUGINFO_1 =
__DEBUGINFO_2 =
!endif
!ifeq DEBUG_INFO 1
__DEBUGINFO_1 = debug all
__DEBUGINFO_2 = debug all
!endif
__OPTIMIZEFLAG =
!ifeq BUILD debug
@@ -164,16 +164,6 @@ __EXCEPTIONSFLAG =
!ifeq USE_EXCEPTIONS 1
__EXCEPTIONSFLAG = -xs
!endif
__WXLIB_BASE_p =
!ifeq MONOLITHIC 0
__WXLIB_BASE_p = &
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif
__WXLIB_MONO_p =
!ifeq MONOLITHIC 1
__WXLIB_MONO_p = &
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif
__WXUNIV_DEFINE_p =
!ifeq WXUNIV 1
__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
@@ -207,6 +197,16 @@ __DLLFLAG_p =
!ifeq SHARED 1
__DLLFLAG_p = -dWXUSINGDLL
!endif
__WXLIB_BASE_p =
!ifeq MONOLITHIC 0
__WXLIB_BASE_p = &
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif
__WXLIB_MONO_p =
!ifeq MONOLITHIC 1
__WXLIB_MONO_p = &
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
!endif
### Variables: ###
@@ -275,6 +275,16 @@ TEST_GUI_OBJECTS = &
$(OBJS)\test_gui_rect.obj &
$(OBJS)\test_gui_size.obj &
$(OBJS)\test_gui_point.obj
PRINTFBENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
$(__RUNTIME_LIBS) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
$(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\include -wx -wcd=549 -wcd=656 &
-wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -dwxUSE_GUI=0 $(CPPUNIT_CFLAGS) &
/fh=$(OBJS)\testprec_printfbench.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
$(CPPFLAGS) $(CXXFLAGS)
PRINTFBENCH_OBJECTS = &
$(OBJS)\printfbench_dummy.obj &
$(OBJS)\printfbench_printfbench.obj
all : $(OBJS)
@@ -283,7 +293,7 @@ $(OBJS) :
### Targets: ###
all : .SYMBOLIC $(OBJS)\test.exe $(__test_gui___depname) data
all : .SYMBOLIC $(OBJS)\test.exe $(__test_gui___depname) data $(OBJS)\printfbench.exe
clean : .SYMBOLIC
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj
@@ -293,13 +303,14 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-if exist $(OBJS)\test.exe del $(OBJS)\test.exe
-if exist $(OBJS)\test_gui.exe del $(OBJS)\test_gui.exe
-if exist $(OBJS)\printfbench.exe del $(OBJS)\printfbench.exe
$(OBJS)\test.exe : $(TEST_OBJECTS)
@%create $(OBJS)\test.lbc
@%append $(OBJS)\test.lbc option quiet
@%append $(OBJS)\test.lbc name $^@
@%append $(OBJS)\test.lbc option caseexact
@%append $(OBJS)\test.lbc $(LDFLAGS) $(__DEBUGINFO_1) libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS)
@%append $(OBJS)\test.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS)
@for %i in ($(TEST_OBJECTS)) do @%append $(OBJS)\test.lbc file %i
@for %i in ( $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_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
@@ -312,7 +323,7 @@ $(OBJS)\test_gui.exe : $(TEST_GUI_OBJECTS) $(OBJS)\test_gui_sample.res
@%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_'
@%append $(OBJS)\test_gui.lbc $(LDFLAGS) $(__DEBUGINFO_2) 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
@@ -324,6 +335,18 @@ data : .SYMBOLIC
if not exist $(OBJS) mkdir $(OBJS)
for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
$(OBJS)\printfbench.exe : $(PRINTFBENCH_OBJECTS)
@%create $(OBJS)\printfbench.lbc
@%append $(OBJS)\printfbench.lbc option quiet
@%append $(OBJS)\printfbench.lbc name $^@
@%append $(OBJS)\printfbench.lbc option caseexact
@%append $(OBJS)\printfbench.lbc $(LDFLAGS) $(__DEBUGINFO_2) libpath $(LIBDIRNAME) system nt ref 'main_' $(CPPUNIT_LIBS)
@for %i in ($(PRINTFBENCH_OBJECTS)) do @%append $(OBJS)\printfbench.lbc file %i
@for %i in ( $(__WXLIB_BASE_p) $(__WXLIB_MONO_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)\printfbench.lbc library %i
@%append $(OBJS)\printfbench.lbc
@for %i in () do @%append $(OBJS)\printfbench.lbc option stack=%i
wlink @$(OBJS)\printfbench.lbc
$(OBJS)\test_dummy.obj : .AUTODEPEND .\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
@@ -456,3 +479,9 @@ $(OBJS)\test_gui_size.obj : .AUTODEPEND .\geometry\size.cpp
$(OBJS)\test_gui_point.obj : .AUTODEPEND .\geometry\point.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
$(OBJS)\printfbench_dummy.obj : .AUTODEPEND .\dummy.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(PRINTFBENCH_CXXFLAGS) $<
$(OBJS)\printfbench_printfbench.obj : .AUTODEPEND .\benchmarks\printfbench.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(PRINTFBENCH_CXXFLAGS) $<