X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d90d6ea7a007332aa75779f90b30ed39872e494..226de48a85fdfc8ada9c5fa942f94eecc7dc7f8c:/samples/validate/makefile.gcc?ds=sidebyside diff --git a/samples/validate/makefile.gcc b/samples/validate/makefile.gcc index 9ecb6d1c25..3d58afab85 100644 --- a/samples/validate/makefile.gcc +++ b/samples/validate/makefile.gcc @@ -1,6 +1,6 @@ # ========================================================================= # This makefile was generated by -# Bakefile 0.1.9 (http://bakefile.sourceforge.net) +# Bakefile 0.2.0 (http://bakefile.sourceforge.net) # Do not modify, all changes will be overwritten! # ========================================================================= @@ -13,7 +13,7 @@ include ../../build/msw/config.gcc ### Variables: ### CPPDEPS = -MT$@ -MF$@.d -MD -WX_RELEASE_NODOT = 26 +WX_RELEASE_NODOT = 27 OBJS = \ gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) LIBDIRNAME = .\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG) @@ -22,9 +22,10 @@ SETUPHDIR = \ VALIDATE_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__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) -I.\..\..\include -I$(SETUPHDIR) \ - -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) \ - $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I$(SETUPHDIR) -I.\..\..\include -W -Wall -I. $(__DLLFLAG_p) -I.\..\..\samples \ + -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy \ + $(CPPFLAGS) $(CXXFLAGS) VALIDATE_OBJECTS = \ $(OBJS)\validate_validate.o \ $(OBJS)\validate_validate_rc.o @@ -133,6 +134,12 @@ endif ifeq ($(UNICODE),1) __UNICODE_DEFINE_p_1 = --define _UNICODE endif +ifeq ($(MSLU),1) +__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1 +endif +ifeq ($(MSLU),1) +__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1 +endif ifeq ($(SHARED),1) __DLLFLAG_p = -DWXUSINGDLL endif @@ -207,7 +214,7 @@ $(OBJS)\validate_validate.o: ./validate.cpp $(CXX) -c -o $@ $(VALIDATE_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\validate_validate_rc.o: ./validate.rc - windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH + windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH .PHONY: all clean