X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19c35fa587f97cf83e2cb28afe76b8db85b36c9f..3f8b4a3fbe730e5843de98529cc2c1b03a7910ef:/contrib/samples/gizmos/multicell/makefile.gcc diff --git a/contrib/samples/gizmos/multicell/makefile.gcc b/contrib/samples/gizmos/multicell/makefile.gcc index d3e819cc47..ca7cf684e1 100644 --- a/contrib/samples/gizmos/multicell/makefile.gcc +++ b/contrib/samples/gizmos/multicell/makefile.gcc @@ -12,10 +12,11 @@ include ../../../../build/msw/config.gcc ### Variables: ### -MTEST_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \ - -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \ - $(__UNICODE_DEFINE_p) -I.\..\..\..\..\include -I$(SETUPHDIR) -I. \ - $(__DLLFLAG_p) -I.\..\..\..\..\samples -I.\..\..\..\include $(CXXFLAGS) +MTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(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 -I.\..\..\..\include $(__EXCEPTIONSFLAG_4) \ + $(__EXCEPTIONSFLAG_5) $(CPPFLAGS) $(CXXFLAGS) MTEST_OBJECTS = \ $(OBJS)\mtest_sample_rc.o \ $(OBJS)\mtest_mtest.o @@ -96,6 +97,18 @@ endif ifeq ($(SHARED),1) __DLLFLAG_p_1 = --define WXUSINGDLL endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONSFLAG_4 = -fno-rtti +endif +ifeq ($(USE_EXCEPTIONS),1) +__EXCEPTIONSFLAG_4 = +endif +ifeq ($(USE_EXCEPTIONS),0) +__EXCEPTIONSFLAG_5 = -fno-exceptions +endif +ifeq ($(USE_EXCEPTIONS),1) +__EXCEPTIONSFLAG_5 = +endif ifeq ($(USE_GUI),1) __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG) endif @@ -112,10 +125,10 @@ ifeq ($(BUILD),release) __OPTIMIZEFLAG_2 = -O2 endif ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1 +__UNICODE_DEFINE_p = -D_UNICODE endif ifeq ($(UNICODE),1) -__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1 +__UNICODE_DEFINE_p_1 = --define _UNICODE endif ifeq ($(MSLU),1) __UNICOWS_LIB_p = -lunicows @@ -147,17 +160,17 @@ $(OBJS): all: $(OBJS)\mtest.exe -$(OBJS)\mtest_mtest.o: .\mtest.cpp +$(OBJS)\mtest_mtest.o: ./mtest.cpp $(CXX) -c -o $@ $(MTEST_CXXFLAGS) $< -$(OBJS)\mtest_sample_rc.o: .\..\..\..\..\samples\sample.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../../samples +$(OBJS)\mtest_sample_rc.o: ./../../../../samples/sample.rc + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../../samples clean: -if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\mtest.exe del $(OBJS)\mtest.exe $(OBJS)\mtest.exe: $(MTEST_OBJECTS) $(OBJS)\mtest_sample_rc.o - $(CXX) -o $@ $(MTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 + $(CXX) -o $@ $(MTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows -lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_gizmos $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 .PHONY: all clean