X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d90d6ea7a007332aa75779f90b30ed39872e494..6ce8b8484654b5ab073951373c93d9bdd8221881:/contrib/samples/deprecated/resource/makefile.gcc diff --git a/contrib/samples/deprecated/resource/makefile.gcc b/contrib/samples/deprecated/resource/makefile.gcc index 2d3a2414cc..c5f172f338 100644 --- a/contrib/samples/deprecated/resource/makefile.gcc +++ b/contrib/samples/deprecated/resource/makefile.gcc @@ -22,10 +22,10 @@ SETUPHDIR = \ RESOURCE_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 \ - -I.\..\..\..\include $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \ - -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) + $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \ + -I.\..\..\..\..\include -I$(SETUPHDIR) -W -Wall -I. $(__DLLFLAG_p) \ + -I.\..\..\..\..\samples -DNOPCH -I.\..\..\..\include $(__RTTIFLAG_5) \ + $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS) RESOURCE_OBJECTS = \ $(OBJS)\resource_resource.o \ $(OBJS)\resource_resource_rc.o @@ -134,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 @@ -208,7 +214,7 @@ $(OBJS)\resource_resource.o: ./resource.cpp $(CXX) -c -o $@ $(RESOURCE_CXXFLAGS) $(CPPDEPS) $< $(OBJS)\resource_resource_rc.o: ./resource.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 --include-dir ./../../../include + 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 ./../../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../../../samples --define NOPCH --include-dir ./../../../include .PHONY: all clean