\r
### Variables: ###\r
\r
-WX_RELEASE_NODOT = 29\r
+WX_RELEASE_NODOT = 30\r
COMPILER_PREFIX = bcc\r
OBJS = \\r
- $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
+LIBDIRNAME = \\r
+ .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)\r
SETUPHDIR = \\r
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
-BENCH_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
- $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
+BENCH_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
+ $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
$(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
$(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
$(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \\r
- $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \\r
+ $(____CAIRO_INCLUDEDIR_FILENAMES) -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \\r
$(CPPFLAGS) $(CXXFLAGS)\r
BENCH_OBJECTS = \\r
$(OBJS)\bench_bench.obj \\r
$(OBJS)\bench_htmlpars.obj \\r
$(OBJS)\bench_htmltag.obj \\r
$(OBJS)\bench_ipcclient.obj \\r
+ $(OBJS)\bench_log.obj \\r
$(OBJS)\bench_mbconv.obj \\r
$(OBJS)\bench_strings.obj \\r
$(OBJS)\bench_tls.obj \\r
$(OBJS)\bench_printfbench.obj\r
+BENCH_GUI_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
+ $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
+ $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
+ $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
+ $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \\r
+ $(____CAIRO_INCLUDEDIR_FILENAMES) -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
+ -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
+BENCH_GUI_OBJECTS = \\r
+ $(OBJS)\bench_gui_bench.obj \\r
+ $(OBJS)\bench_gui_image.obj\r
\r
### Conditionally set variables: ###\r
\r
PORTNAME = base\r
!endif\r
!if "$(USE_GUI)" == "1"\r
-PORTNAME = msw\r
+PORTNAME = msw$(TOOLKIT_VERSION)\r
+!endif\r
+!if "$(OFFICIAL_BUILD)" == "1"\r
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r
!endif\r
!if "$(BUILD)" == "debug"\r
WXDEBUGFLAG = d\r
EXTRALIBS_FOR_BASE = \r
!endif\r
!if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE = \r
+EXTRALIBS_FOR_BASE = \r
+!endif\r
+!if "$(MONOLITHIC)" == "0"\r
+__WXLIB_NET_p = \\r
+ wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
+!endif\r
+!if "$(MONOLITHIC)" == "1"\r
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__bench_gui___depname = $(OBJS)\bench_gui.exe\r
+!endif\r
+!if "$(WXUNIV)" == "1"\r
+__WXUNIV_DEFINE_p_3 = -d__WXUNIVERSAL__\r
+!endif\r
+!if "$(DEBUG_FLAG)" == "0"\r
+__DEBUG_DEFINE_p_3 = -dwxDEBUG_LEVEL=0\r
+!endif\r
+!if "$(BUILD)" == "release"\r
+__NDEBUG_DEFINE_p_3 = -dNDEBUG\r
+!endif\r
+!if "$(USE_EXCEPTIONS)" == "0"\r
+__EXCEPTIONS_DEFINE_p_3 = -dwxNO_EXCEPTIONS\r
+!endif\r
+!if "$(USE_RTTI)" == "0"\r
+__RTTI_DEFINE_p_3 = -dwxNO_RTTI\r
+!endif\r
+!if "$(USE_THREADS)" == "0"\r
+__THREAD_DEFINE_p_3 = -dwxNO_THREADS\r
+!endif\r
+!if "$(UNICODE)" == "0"\r
+__UNICODE_DEFINE_p_3 = -dwxUSE_UNICODE=0\r
+!endif\r
+!if "$(UNICODE)" == "1"\r
+__UNICODE_DEFINE_p_3 = -d_UNICODE\r
+!endif\r
+!if "$(MSLU)" == "1"\r
+__MSLU_DEFINE_p_3 = -dwxUSE_UNICODE_MSLU=1\r
+!endif\r
+!if "$(USE_CAIRO)" == "1"\r
+____CAIRO_INCLUDEDIR_FILENAMES_3_p = -i$(CAIRO_ROOT)\include\cairo\r
+!endif\r
+!if "$(SHARED)" == "1"\r
+__DLLFLAG_p_3 = -dWXUSINGDLL\r
+!endif\r
+!if "$(MONOLITHIC)" == "0"\r
+__WXLIB_CORE_p = \\r
+ wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib\r
+!endif\r
+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"\r
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib\r
!endif\r
!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG_2 = -Od\r
+__OPTIMIZEFLAG = -Od\r
!endif\r
!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG_2 = -O2\r
+__OPTIMIZEFLAG = -O2\r
!endif\r
!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_5 = \r
+__THREADSFLAG = \r
!endif\r
!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_5 = mt\r
+__THREADSFLAG = mt\r
!endif\r
!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_6 = \r
+__THREADSFLAG_0 = \r
!endif\r
!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_6 = -tWM\r
+__THREADSFLAG_0 = -tWM\r
!endif\r
!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_7 = -tWR\r
+__RUNTIME_LIBS = -tWR\r
!endif\r
!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_7 = \r
+__RUNTIME_LIBS = \r
!endif\r
!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_8 = i\r
+__RUNTIME_LIBS_0 = i\r
!endif\r
!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_8 = \r
+__RUNTIME_LIBS_0 = \r
!endif\r
!if "$(WXUNIV)" == "1"\r
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
!endif\r
!if "$(USE_CAIRO)" == "1"\r
-____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo\r
+____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo\r
!endif\r
!if "$(SHARED)" == "1"\r
__DLLFLAG_p = -DWXUSINGDLL\r
!endif\r
!if "$(MONOLITHIC)" == "0"\r
-__WXLIB_NET_p = \\r
- wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net.lib\r
-!endif\r
-!if "$(MONOLITHIC)" == "0"\r
__WXLIB_BASE_p = \\r
wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
!endif\r
__WXLIB_MONO_p = \\r
wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
!endif\r
-!if "$(MONOLITHIC)" == "1"\r
-__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)\r
-!endif\r
!if "$(USE_GUI)" == "1"\r
__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
!endif\r
__CAIRO_LIB_p = cairo.lib\r
!endif\r
!if "$(USE_CAIRO)" == "1"\r
-____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib\r
+____CAIRO_LIBDIR_FILENAMES = -L$(CAIRO_ROOT)\lib\r
!endif\r
!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
__DEBUGINFO = -v\r
\r
### Targets: ###\r
\r
-all: $(OBJS)\bench.exe data\r
+all: $(OBJS)\bench.exe data $(__bench_gui___depname) data-image\r
\r
clean: \r
-if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
-if exist $(OBJS)\bench.ild del $(OBJS)\bench.ild\r
-if exist $(OBJS)\bench.ilf del $(OBJS)\bench.ilf\r
-if exist $(OBJS)\bench.ils del $(OBJS)\bench.ils\r
+ -if exist $(OBJS)\bench_gui.exe del $(OBJS)\bench_gui.exe\r
+ -if exist $(OBJS)\bench_gui.tds del $(OBJS)\bench_gui.tds\r
+ -if exist $(OBJS)\bench_gui.ilc del $(OBJS)\bench_gui.ilc\r
+ -if exist $(OBJS)\bench_gui.ild del $(OBJS)\bench_gui.ild\r
+ -if exist $(OBJS)\bench_gui.ilf del $(OBJS)\bench_gui.ilf\r
+ -if exist $(OBJS)\bench_gui.ils del $(OBJS)\bench_gui.ils\r
\r
$(OBJS)\bench.exe: $(BENCH_OBJECTS)\r
- ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r
- c0x32.obj $(BENCH_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,\r
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|\r
+ c0x32.obj $(BENCH_OBJECTS),$@,, $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,,\r
|\r
\r
data: \r
if not exist $(OBJS) mkdir $(OBJS)\r
for %f in (htmltest.html) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
\r
+!if "$(USE_GUI)" == "1"\r
+$(OBJS)\bench_gui.exe: $(BENCH_GUI_OBJECTS) $(OBJS)\bench_gui_sample.res\r
+ ilink32 -Tpe -q -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO) -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|\r
+ c0x32.obj $(BENCH_GUI_OBJECTS),$@,, $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\bench_gui_sample.res\r
+|\r
+!endif\r
+\r
+data-image: \r
+ if not exist $(OBJS) mkdir $(OBJS)\r
+ for %f in (../../samples/image/horse.bmp ../../samples/image/horse.jpg ../../samples/image/horse.png ../../samples/image/horse.tif) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
+\r
$(OBJS)\bench_bench.obj: .\bench.cpp\r
$(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\bench.cpp\r
\r
$(OBJS)\bench_ipcclient.obj: .\ipcclient.cpp\r
$(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\ipcclient.cpp\r
\r
+$(OBJS)\bench_log.obj: .\log.cpp\r
+ $(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\log.cpp\r
+\r
$(OBJS)\bench_mbconv.obj: .\mbconv.cpp\r
$(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\mbconv.cpp\r
\r
$(OBJS)\bench_printfbench.obj: .\printfbench.cpp\r
$(CXX) -q -c -P -o$@ $(BENCH_CXXFLAGS) .\printfbench.cpp\r
\r
+$(OBJS)\bench_gui_sample.res: .\..\..\samples\sample.rc\r
+ brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__NDEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_3_p) -i. $(__DLLFLAG_p_3) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
+\r
+$(OBJS)\bench_gui_bench.obj: .\bench.cpp\r
+ $(CXX) -q -c -P -o$@ $(BENCH_GUI_CXXFLAGS) .\bench.cpp\r
+\r
+$(OBJS)\bench_gui_image.obj: .\image.cpp\r
+ $(CXX) -q -c -P -o$@ $(BENCH_GUI_CXXFLAGS) .\image.cpp\r
+\r
projects / wxWidgets.git / blobdiff