Mention converting ANSI->Unicode, patch 1247339 Eric Kow

[wxWidgets.git] / contrib / build / ogl / makefile.gcc

diff --git a/contrib/build/ogl/makefile.gcc b/contrib/build/ogl/makefile.gcc
index 993d7e13115dfca9d58fb938e0fd8ade202a26e4..112e6365fd504e556f99e048203e4b2485f171d6 100644 (file)
--- a/contrib/build/ogl/makefile.gcc
+++ b/contrib/build/ogl/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -12,8 +12,8 @@ include ../../../build/msw/config.gcc
 
 ### Variables: ###
 
-WX_RELEASE_NODOT = 25
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5
+CPPDEPS = -MT$@ -MF$@.d -MD
+WX_RELEASE_NODOT = 26
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
@@ -22,10 +22,10 @@ SETUPHDIR = \
 OGLDLL_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..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) -W \
-       -Wall -I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL \
-       $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) \
-       $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I..\..\src\ogl\..\..\..\include \
+       -I$(SETUPHDIR) -W -Wall -I..\..\src\ogl\..\..\include -DWXUSINGDLL \
+       -DWXMAKINGDLL_OGL $(__RTTIFLAG) $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy \
+       $(CPPFLAGS) $(CXXFLAGS)
 OGLDLL_OBJECTS =  \
        $(OBJS)\ogldll_dummy.o \
        $(OBJS)\ogldll_version_rc.o \
@@ -44,9 +44,9 @@ OGLDLL_OBJECTS =  \
 OGLLIB_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..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) -W \
-       -Wall -I..\..\src\ogl\..\..\include $(__RTTIFLAG) $(__EXCEPTIONSFLAG) \
-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I..\..\src\ogl\..\..\..\include \
+       -I$(SETUPHDIR) -W -Wall -I..\..\src\ogl\..\..\include $(__RTTIFLAG) \
+       $(__EXCEPTIONSFLAG) -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 OGLLIB_OBJECTS =  \
        $(OBJS)\ogllib_dummy.o \
        $(OBJS)\ogllib_basic2.o \
@@ -110,7 +110,7 @@ EXTRALIBS_FOR_BASE =
 endif
 ifeq ($(SHARED),1)
 __ogldll___depname = \
-       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG).dll
+       $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG).dll
 endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
@@ -135,6 +135,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define _UNICODE
 endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
+endif
 ifeq ($(MONOLITHIC),1)
 __WXLIB_MONO_p = \
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
@@ -226,6 +229,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -D_UNICODE
 endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
 
 
 all: $(OBJS)
@@ -238,12 +244,13 @@ all: $(__ogldll___depname) $(__ogllib___depname)
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
-       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG).dll
+       -if exist $(OBJS)\*.d del $(OBJS)\*.d
+       -if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG).dll
        -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a
        -if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a
 
 ifeq ($(SHARED),1)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG).dll: $(OGLDLL_OBJECTS) $(OBJS)\ogldll_version_rc.o
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG).dll: $(OGLDLL_OBJECTS) $(OBJS)\ogldll_version_rc.o
        $(CXX) -shared -fPIC -o $@ $(OGLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lodbc32  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
 endif
 
@@ -255,86 +262,88 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
 endif
 
 $(OBJS)\ogldll_dummy.o: ../../src/ogl/../../../src/msw/dummy.cpp
-       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogldll_version_rc.o: ../../src/ogl/src/msw/version.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 ../../src/ogl/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG)
+$(OBJS)\ogldll_version_rc.o: ../../src/ogl/../../../src/msw/version.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) $(__MSLU_DEFINE_p_1) --include-dir ../../src/ogl/../../../include --include-dir $(SETUPHDIR) --define WXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG)
 
 $(OBJS)\ogldll_basic2.o: ../../src/ogl/basic2.cpp
-       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogldll_canvas.o: ../../src/ogl/canvas.cpp
-       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogldll_divided.o: ../../src/ogl/divided.cpp
-       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogldll_mfutils.o: ../../src/ogl/mfutils.cpp
-       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogldll_oglmisc.o: ../../src/ogl/oglmisc.cpp
-       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogldll_basic.o: ../../src/ogl/basic.cpp
-       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogldll_composit.o: ../../src/ogl/composit.cpp
-       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogldll_drawn.o: ../../src/ogl/drawn.cpp
-       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogldll_bmpshape.o: ../../src/ogl/bmpshape.cpp
-       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogldll_constrnt.o: ../../src/ogl/constrnt.cpp
-       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogldll_lines.o: ../../src/ogl/lines.cpp
-       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogldll_ogldiag.o: ../../src/ogl/ogldiag.cpp
-       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogllib_dummy.o: ../../src/ogl/../../../src/msw/dummy.cpp
-       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogllib_basic2.o: ../../src/ogl/basic2.cpp
-       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogllib_canvas.o: ../../src/ogl/canvas.cpp
-       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogllib_divided.o: ../../src/ogl/divided.cpp
-       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogllib_mfutils.o: ../../src/ogl/mfutils.cpp
-       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogllib_oglmisc.o: ../../src/ogl/oglmisc.cpp
-       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogllib_basic.o: ../../src/ogl/basic.cpp
-       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogllib_composit.o: ../../src/ogl/composit.cpp
-       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogllib_drawn.o: ../../src/ogl/drawn.cpp
-       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogllib_bmpshape.o: ../../src/ogl/bmpshape.cpp
-       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogllib_constrnt.o: ../../src/ogl/constrnt.cpp
-       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogllib_lines.o: ../../src/ogl/lines.cpp
-       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\ogllib_ogldiag.o: ../../src/ogl/ogldiag.cpp
-       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 .PHONY: all clean
 
 
+# Dependencies tracking:
+-include $(OBJS)/*.d