WX_RELEASE_NODOT = 29\r
COMPILER_PREFIX = gcc\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 = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
- $(GCCFLAGS) -DHAVE_W32API_H -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) -W -Wall -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 \\r
- $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) \\r
- $(CXXFLAGS)\r
+BENCH_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \\r
+ -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \\r
+ $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
+ $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
+ -I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES) -W -Wall \\r
+ -I. $(__DLLFLAG_p) -DwxUSE_GUI=0 $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
+ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
BENCH_OBJECTS = \\r
$(OBJS)\bench_bench.o \\r
$(OBJS)\bench_datetime.o \\r
$(OBJS)\bench_htmlpars.o \\r
$(OBJS)\bench_htmltag.o \\r
$(OBJS)\bench_ipcclient.o \\r
+ $(OBJS)\bench_log.o \\r
$(OBJS)\bench_mbconv.o \\r
$(OBJS)\bench_strings.o \\r
$(OBJS)\bench_tls.o \\r
$(OBJS)\bench_printfbench.o\r
+BENCH_GUI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) \\r
+ $(GCCFLAGS) -DHAVE_W32API_H -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) -W -Wall -I. $(__DLLFLAG_p) \\r
+ -I.\..\..\samples -DNOPCH $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \\r
+ -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
+BENCH_GUI_OBJECTS = \\r
+ $(OBJS)\bench_gui_sample_rc.o \\r
+ $(OBJS)\bench_gui_bench.o \\r
+ $(OBJS)\bench_gui_image.o\r
\r
### Conditionally set variables: ###\r
\r
PORTNAME = base\r
endif\r
ifeq ($(USE_GUI),1)\r
-PORTNAME = msw\r
+PORTNAME = msw$(TOOLKIT_VERSION)\r
+endif\r
+ifeq ($(OFFICIAL_BUILD),1)\r
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r
endif\r
ifeq ($(BUILD),debug)\r
WXDEBUGFLAG = d\r
EXTRALIBS_FOR_BASE = \r
endif\r
ifeq ($(MONOLITHIC),1)\r
-EXTRALIBS_FOR_BASE = \r
+EXTRALIBS_FOR_BASE = \r
+endif\r
+ifeq ($(MONOLITHIC),0)\r
+__WXLIB_NET_p = \\r
+ -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net\r
+endif\r
+ifeq ($(MONOLITHIC),1)\r
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)\r
+endif\r
+ifeq ($(USE_GUI),1)\r
+__bench_gui___depname = $(OBJS)\bench_gui.exe\r
+endif\r
+ifeq ($(WXUNIV),1)\r
+__WXUNIV_DEFINE_p_3 = --define __WXUNIVERSAL__\r
+endif\r
+ifeq ($(DEBUG_FLAG),0)\r
+__DEBUG_DEFINE_p_3 = --define wxDEBUG_LEVEL=0\r
+endif\r
+ifeq ($(BUILD),release)\r
+__NDEBUG_DEFINE_p_3 = --define NDEBUG\r
+endif\r
+ifeq ($(USE_EXCEPTIONS),0)\r
+__EXCEPTIONS_DEFINE_p_3 = --define wxNO_EXCEPTIONS\r
+endif\r
+ifeq ($(USE_RTTI),0)\r
+__RTTI_DEFINE_p_3 = --define wxNO_RTTI\r
+endif\r
+ifeq ($(USE_THREADS),0)\r
+__THREAD_DEFINE_p_3 = --define wxNO_THREADS\r
+endif\r
+ifeq ($(UNICODE),0)\r
+__UNICODE_DEFINE_p_3 = --define wxUSE_UNICODE=0\r
+endif\r
+ifeq ($(UNICODE),1)\r
+__UNICODE_DEFINE_p_3 = --define _UNICODE\r
+endif\r
+ifeq ($(MSLU),1)\r
+__MSLU_DEFINE_p_3 = --define wxUSE_UNICODE_MSLU=1\r
+endif\r
+ifeq ($(USE_CAIRO),1)\r
+__CAIRO_INCLUDEDIR_p_1 = --include-dir $(CAIRO_ROOT)/include/cairo\r
+endif\r
+ifeq ($(SHARED),1)\r
+__DLLFLAG_p_3 = --define WXUSINGDLL\r
+endif\r
+ifeq ($(MONOLITHIC),0)\r
+__WXLIB_CORE_p = \\r
+ -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core\r
+endif\r
+ifeq ($(MONOLITHIC),1)\r
+ifeq ($(USE_STC),1)
+__LIB_SCINTILLA_IF_MONO_p = -lwxscintilla$(WXDEBUGFLAG)\r
+endif\r
+endif
+ifeq ($(USE_GUI),1)\r
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)\r
+endif\r
+ifeq ($(USE_GUI),1)\r
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)\r
endif\r
ifeq ($(BUILD),debug)\r
-__OPTIMIZEFLAG_2 = -O0\r
+__OPTIMIZEFLAG = -O0\r
endif\r
ifeq ($(BUILD),release)\r
-__OPTIMIZEFLAG_2 = -O2\r
+__OPTIMIZEFLAG = -O2\r
endif\r
ifeq ($(USE_RTTI),0)\r
-__RTTIFLAG_5 = -fno-rtti\r
+__RTTIFLAG = -fno-rtti\r
endif\r
ifeq ($(USE_RTTI),1)\r
-__RTTIFLAG_5 = \r
+__RTTIFLAG = \r
endif\r
ifeq ($(USE_EXCEPTIONS),0)\r
-__EXCEPTIONSFLAG_6 = -fno-exceptions\r
+__EXCEPTIONSFLAG = -fno-exceptions\r
endif\r
ifeq ($(USE_EXCEPTIONS),1)\r
-__EXCEPTIONSFLAG_6 = \r
+__EXCEPTIONSFLAG = \r
endif\r
ifeq ($(WXUNIV),1)\r
__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
endif\r
ifeq ($(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
ifeq ($(SHARED),1)\r
__DLLFLAG_p = -DWXUSINGDLL\r
endif\r
ifeq ($(MONOLITHIC),0)\r
-__WXLIB_NET_p = \\r
- -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_net\r
-endif\r
-ifeq ($(MONOLITHIC),0)\r
__WXLIB_BASE_p = \\r
-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
endif\r
__WXLIB_MONO_p = \\r
-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)\r
endif\r
-ifeq ($(MONOLITHIC),1)\r
-__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)\r
-endif\r
ifeq ($(USE_GUI),1)\r
__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)\r
endif\r
__CAIRO_LIB_p = -lcairo\r
endif\r
ifeq ($(USE_CAIRO),1)\r
-____CAIRO_LIBDIR_FILENAMES_p = -L$(CAIRO_ROOT)\lib\r
+____CAIRO_LIBDIR_FILENAMES = -L$(CAIRO_ROOT)\lib\r
endif\r
ifeq ($(BUILD),debug)\r
ifeq ($(DEBUG_INFO),default)\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)\*.o del $(OBJS)\*.o\r
-if exist $(OBJS)\*.d del $(OBJS)\*.d\r
-if exist $(OBJS)\bench.exe del $(OBJS)\bench.exe\r
+ -if exist $(OBJS)\bench_gui.exe del $(OBJS)\bench_gui.exe\r
\r
$(OBJS)\bench.exe: $(BENCH_OBJECTS)\r
- $(CXX) -o $@ $(BENCH_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
+ $(CXX) -o $@ $(BENCH_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_NET_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\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
+ifeq ($(USE_GUI),1)\r
+$(OBJS)\bench_gui.exe: $(BENCH_GUI_OBJECTS) $(OBJS)\bench_gui_sample_rc.o\r
+ $(CXX) -o $@ $(BENCH_GUI_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\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.o: ./bench.cpp\r
$(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<\r
\r
$(OBJS)\bench_ipcclient.o: ./ipcclient.cpp\r
$(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<\r
\r
+$(OBJS)\bench_log.o: ./log.cpp\r
+ $(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<\r
+\r
$(OBJS)\bench_mbconv.o: ./mbconv.cpp\r
$(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<\r
\r
$(OBJS)\bench_printfbench.o: ./printfbench.cpp\r
$(CXX) -c -o $@ $(BENCH_CXXFLAGS) $(CPPDEPS) $<\r
\r
-.PHONY: all clean data\r
+$(OBJS)\bench_gui_sample_rc.o: ./../../samples/sample.rc\r
+ windres --use-temp-file -i$< -o$@ --define __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) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p_1) --include-dir . $(__DLLFLAG_p_3) --include-dir ./../../samples --define NOPCH\r
+\r
+$(OBJS)\bench_gui_bench.o: ./bench.cpp\r
+ $(CXX) -c -o $@ $(BENCH_GUI_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\bench_gui_image.o: ./image.cpp\r
+ $(CXX) -c -o $@ $(BENCH_GUI_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+.PHONY: all clean data data-image\r
\r
\r
SHELL := $(COMSPEC)\r
projects / wxWidgets.git / blobdiff