check default library directories in WX_PATH_FIND_LIBRARIES; do *not* add default...

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

diff --git a/contrib/build/ogl/makefile.gcc b/contrib/build/ogl/makefile.gcc
index da945995747decea91c5b35d1dbbdd20a7b83618..112e6365fd504e556f99e048203e4b2485f171d6 100644 (file)
--- a/contrib/build/ogl/makefile.gcc
+++ b/contrib/build/ogl/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     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!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -12,6 +12,7 @@ include ../../../build/msw/config.gcc
 
 ### Variables: ###
 
 
 ### Variables: ###
 

+CPPDEPS = -MT$@ -MF$@.d -MD

 WX_RELEASE_NODOT = 26
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 WX_RELEASE_NODOT = 26
 OBJS = \
        gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)


@@ -21,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) \
 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 \
 OGLDLL_OBJECTS =  \
        $(OBJS)\ogldll_dummy.o \
        $(OBJS)\ogldll_version_rc.o \


@@ -43,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) \
 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 \
 OGLLIB_OBJECTS =  \
        $(OBJS)\ogllib_dummy.o \
        $(OBJS)\ogllib_basic2.o \


@@ -134,6 +135,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define _UNICODE
 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)
 ifeq ($(MONOLITHIC),1)
 __WXLIB_MONO_p = \
        -lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)


@@ -225,6 +229,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -D_UNICODE
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -D_UNICODE
 endif

+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif

 
 
 all: $(OBJS)
 
 
 all: $(OBJS)


@@ -237,6 +244,7 @@ all: $(__ogldll___depname) $(__ogllib___depname)
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
 
 clean: 
        -if exist $(OBJS)\*.o del $(OBJS)\*.o

+       -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
        -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


@@ -254,86 +262,88 @@ $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(
 endif
 
 $(OBJS)\ogldll_dummy.o: ../../src/ogl/../../../src/msw/dummy.cpp
 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
 
 $(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_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG)
+       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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(OBJS)\ogllib_ogldiag.o: ../../src/ogl/ogldiag.cpp

-       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+       $(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<

 
 .PHONY: all clean
 
 
 
 .PHONY: all clean
 
 

+# Dependencies tracking:
+-include $(OBJS)/*.d