X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d90d6ea7a007332aa75779f90b30ed39872e494..65baafba0e8cd74f2264b7e2f7625ff5bea84864:/contrib/samples/fl/makefile.gcc

diff --git a/contrib/samples/fl/makefile.gcc b/contrib/samples/fl/makefile.gcc
index ef9568b842..8ab4cfab2a 100644
--- a/contrib/samples/fl/makefile.gcc
+++ b/contrib/samples/fl/makefile.gcc
@@ -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,50 +22,55 @@ SETUPHDIR = \
 FL_DEMO1_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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 -DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	-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 -DBMP_DIR=\"bitmaps/\" \
+	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
+	$(CXXFLAGS)
 FL_DEMO1_OBJECTS =  \
 	$(OBJS)\fl_demo1_fl_demo1.o \
 	$(OBJS)\fl_demo1_fl_demo1_rc.o
 FL_DEMO2_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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 -DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	-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 -DBMP_DIR=\"bitmaps/\" \
+	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
+	$(CXXFLAGS)
 FL_DEMO2_OBJECTS =  \
 	$(OBJS)\fl_demo2_fl_demo2.o \
 	$(OBJS)\fl_demo2_fl_demo2_rc.o
 FL_SAMPLE1_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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 -DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	-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 -DBMP_DIR=\"bitmaps/\" \
+	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
+	$(CXXFLAGS)
 FL_SAMPLE1_OBJECTS =  \
 	$(OBJS)\fl_sample1_fl_sample1.o \
 	$(OBJS)\fl_sample1_fl_sample1_rc.o
 FL_SAMPLE2_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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 -DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	-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 -DBMP_DIR=\"bitmaps/\" \
+	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
+	$(CXXFLAGS)
 FL_SAMPLE2_OBJECTS =  \
 	$(OBJS)\fl_sample2_fl_sample2.o \
 	$(OBJS)\fl_sample2_fl_sample2_rc.o
 FL_SAMPLE3_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__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 -DBMP_DIR=\"bitmaps/\" $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-	-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 -DBMP_DIR=\"bitmaps/\" \
+	$(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
+	$(CXXFLAGS)
 FL_SAMPLE3_OBJECTS =  \
 	$(OBJS)\fl_sample3_fl_sample3.o \
 	$(OBJS)\fl_sample3_fl_sample3_rc.o
@@ -174,6 +179,12 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_12 = --define _UNICODE
 endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_12 = --define wxUSE_UNICODE_MSLU=1
+endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p = -DWXUSINGDLL
 endif
@@ -268,31 +279,31 @@ $(OBJS)\fl_demo1_fl_demo1.o: ./fl_demo1.cpp
 	$(CXX) -c -o $@ $(FL_DEMO1_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fl_demo1_fl_demo1_rc.o: ./fl_demo1.rc
-	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include --define BMP_DIR="bitmaps/"
+	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include --define BMP_DIR="bitmaps/"
 
 $(OBJS)\fl_demo2_fl_demo2.o: ./fl_demo2.cpp
 	$(CXX) -c -o $@ $(FL_DEMO2_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fl_demo2_fl_demo2_rc.o: ./fl_demo2.rc
-	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include --define BMP_DIR="bitmaps/"
+	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include --define BMP_DIR="bitmaps/"
 
 $(OBJS)\fl_sample1_fl_sample1.o: ./fl_sample1.cpp
 	$(CXX) -c -o $@ $(FL_SAMPLE1_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fl_sample1_fl_sample1_rc.o: ./fl_sample1.rc
-	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include --define BMP_DIR="bitmaps/"
+	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include --define BMP_DIR="bitmaps/"
 
 $(OBJS)\fl_sample2_fl_sample2.o: ./fl_sample2.cpp
 	$(CXX) -c -o $@ $(FL_SAMPLE2_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fl_sample2_fl_sample2_rc.o: ./fl_sample2.rc
-	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include --define BMP_DIR="bitmaps/"
+	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include --define BMP_DIR="bitmaps/"
 
 $(OBJS)\fl_sample3_fl_sample3.o: ./fl_sample3.cpp
 	$(CXX) -c -o $@ $(FL_SAMPLE3_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\fl_sample3_fl_sample3_rc.o: ./fl_sample3.rc
-	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include --define BMP_DIR="bitmaps/"
+	windres --use-temp-file -i$< -o$@   --define __WXMSW__ $(__WXUNIV_DEFINE_p_12) $(__DEBUG_DEFINE_p_12) $(__EXCEPTIONS_DEFINE_p_12) $(__RTTI_DEFINE_p_12) $(__THREAD_DEFINE_p_12) $(__UNICODE_DEFINE_p_12) $(__MSLU_DEFINE_p_12) --include-dir ./../../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_12) --include-dir ./../../../samples --define NOPCH --include-dir ./../../include --define BMP_DIR="bitmaps/"
 
 .PHONY: all clean data_files