X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4ad36cdc53b0df79a51386c15a384beb2f7333a..957f5ab77abb14c70c60f18196e1e0d39292ee59:/contrib/build/ogl/makefile.gcc

diff --git a/contrib/build/ogl/makefile.gcc b/contrib/build/ogl/makefile.gcc
index 4538004ecd..81e9ea1995 100644
--- a/contrib/build/ogl/makefile.gcc
+++ b/contrib/build/ogl/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -14,11 +14,13 @@ include ../../../build/msw/config.gcc
 
 OBJS = \
 	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-OGLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) -Wall \
-	-I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL $(CXXFLAGS) \
-	$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0)
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+OGLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
+	-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+	-I..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) -Wall \
+	-I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL \
+	$(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) $(CPPFLAGS) $(CXXFLAGS)
 OGLDLL_OBJECTS =  \
 	$(OBJS)\ogldll_dummy.o \
 	$(OBJS)\ogldll_basic2.o \
@@ -33,11 +35,11 @@ OGLDLL_OBJECTS =  \
 	$(OBJS)\ogldll_constrnt.o \
 	$(OBJS)\ogldll_lines.o \
 	$(OBJS)\ogldll_ogldiag.o
-OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
-	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) -Wall \
-	-I..\..\src\ogl\..\..\include $(CXXFLAGS) $(__EXCEPTIONSFLAG) \
-	$(__EXCEPTIONSFLAG_0)
+OGLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) -DHAVE_W32API_H \
+	-D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) \
+	-I..\..\src\ogl\..\..\..\include -I$(SETUPHDIR) -Wall \
+	-I..\..\src\ogl\..\..\include $(__EXCEPTIONSFLAG) $(__EXCEPTIONSFLAG_0) \
+	$(CPPFLAGS) $(CXXFLAGS)
 OGLLIB_OBJECTS =  \
 	$(OBJS)\ogllib_dummy.o \
 	$(OBJS)\ogllib_basic2.o \
@@ -52,20 +54,12 @@ OGLLIB_OBJECTS =  \
 	$(OBJS)\ogllib_constrnt.o \
 	$(OBJS)\ogllib_lines.o \
 	$(OBJS)\ogllib_ogldiag.o
-SETUPHDIR = \
-	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 
 ### Conditionally set variables: ###
 
 ifeq ($(GCC_VERSION),2.95)
 GCCFLAGS = -fvtable-thunks
 endif
-ifeq ($(SHARED),0)
-LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\gcc_lib$(CFG)
-endif
-ifeq ($(SHARED),1)
-LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\gcc_dll$(CFG)
-endif
 ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif
@@ -86,15 +80,46 @@ endif
 ifeq ($(DEBUG_FLAG),1)
 WXDEBUGFLAG = d
 endif
-ifeq ($(SHARED),1)
-WXDLLFLAG = dll
-endif
 ifeq ($(UNICODE),1)
 WXUNICODEFLAG = u
 endif
 ifeq ($(WXUNIV),1)
 WXUNIVNAME = univ
 endif
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
+endif
+ifeq ($(SHARED),1)
+__ogldll___depname = \
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll
+endif
+ifeq ($(MONOLITHIC),1)
+__WXLIB_MONO_p = \
+	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
+endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+endif
+ifeq ($(SHARED),0)
+__ogllib___depname = \
+	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a
+endif
 ifeq ($(BUILD),debug)
 ifeq ($(DEBUG_INFO),default)
 __DEBUGINFO = -g
@@ -112,12 +137,10 @@ ifeq ($(DEBUG_INFO),1)
 __DEBUGINFO = -g
 endif
 ifeq ($(BUILD),debug)
-ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-endif
+__OPTIMIZEFLAG = -O0
 endif
-ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
+ifeq ($(BUILD),release)
+__OPTIMIZEFLAG = -O2
 endif
 ifeq ($(USE_EXCEPTIONS),0)
 __EXCEPTIONSFLAG = -fno-rtti
@@ -131,48 +154,25 @@ endif
 ifeq ($(USE_EXCEPTIONS),1)
 __EXCEPTIONSFLAG_0 = 
 endif
-ifeq ($(USE_GUI),1)
-__LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
-endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
 ifeq ($(BUILD),debug)
-__OPTIMIZEFLAG = -O0
+ifeq ($(DEBUG_FLAG),default)
+__DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
-ifeq ($(BUILD),release)
-__OPTIMIZEFLAG = -O2
+endif
+ifeq ($(DEBUG_FLAG),1)
+__DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p = -D_UNICODE
 endif
-ifeq ($(MSLU),1)
-__UNICOWS_LIB_p = -lunicows
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
-endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-endif
-ifeq ($(WXUNIV),1)
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+ifeq ($(SHARED),0)
+LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\gcc_lib$(CFG)
 endif
 ifeq ($(SHARED),1)
-__ogldll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll
-endif
-ifeq ($(SHARED),0)
-__ogllib___depname = \
-	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a
+LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\gcc_dll$(CFG)
 endif
 
 
@@ -184,100 +184,100 @@ $(OBJS):
 
 all: $(__ogldll___depname) $(__ogllib___depname)
 
-$(OBJS)\ogldll_basic.o: ../../src/ogl/basic.cpp
+clean: 
+	-if exist $(OBJS)\*.o del $(OBJS)\*.o
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll
+	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a
+	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a
+
+ifeq ($(SHARED),1)
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)252$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll: $(OGLDLL_OBJECTS)
+	$(CXX) -shared -o $@ $(OGLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__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
+
+ifeq ($(SHARED),0)
+$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a: $(OGLLIB_OBJECTS)
+	if exist $@ del $@
+	ar rcu $@ $(OGLLIB_OBJECTS)
+	ranlib $@
+endif
+
+$(OBJS)\ogldll_dummy.o: ../../src/ogl/../../../src/msw/dummy.cpp
 	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_basic2.o: ../../src/ogl/basic2.cpp
 	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-$(OBJS)\ogldll_bmpshape.o: ../../src/ogl/bmpshape.cpp
+$(OBJS)\ogldll_canvas.o: ../../src/ogl/canvas.cpp
 	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-$(OBJS)\ogldll_canvas.o: ../../src/ogl/canvas.cpp
+$(OBJS)\ogldll_divided.o: ../../src/ogl/divided.cpp
 	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-$(OBJS)\ogldll_composit.o: ../../src/ogl/composit.cpp
+$(OBJS)\ogldll_mfutils.o: ../../src/ogl/mfutils.cpp
 	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-$(OBJS)\ogldll_constrnt.o: ../../src/ogl/constrnt.cpp
+$(OBJS)\ogldll_oglmisc.o: ../../src/ogl/oglmisc.cpp
 	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-$(OBJS)\ogldll_divided.o: ../../src/ogl/divided.cpp
+$(OBJS)\ogldll_basic.o: ../../src/ogl/basic.cpp
 	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-$(OBJS)\ogldll_drawn.o: ../../src/ogl/drawn.cpp
+$(OBJS)\ogldll_composit.o: ../../src/ogl/composit.cpp
 	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-$(OBJS)\ogldll_dummy.o: ../../src/ogl/../../../src/msw/dummy.cpp
+$(OBJS)\ogldll_drawn.o: ../../src/ogl/drawn.cpp
 	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-$(OBJS)\ogldll_lines.o: ../../src/ogl/lines.cpp
+$(OBJS)\ogldll_bmpshape.o: ../../src/ogl/bmpshape.cpp
 	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-$(OBJS)\ogldll_mfutils.o: ../../src/ogl/mfutils.cpp
+$(OBJS)\ogldll_constrnt.o: ../../src/ogl/constrnt.cpp
 	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-$(OBJS)\ogldll_ogldiag.o: ../../src/ogl/ogldiag.cpp
+$(OBJS)\ogldll_lines.o: ../../src/ogl/lines.cpp
 	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-$(OBJS)\ogldll_oglmisc.o: ../../src/ogl/oglmisc.cpp
+$(OBJS)\ogldll_ogldiag.o: ../../src/ogl/ogldiag.cpp
 	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
 
-$(OBJS)\ogllib_basic.o: ../../src/ogl/basic.cpp
+$(OBJS)\ogllib_dummy.o: ../../src/ogl/../../../src/msw/dummy.cpp
 	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_basic2.o: ../../src/ogl/basic2.cpp
 	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-$(OBJS)\ogllib_bmpshape.o: ../../src/ogl/bmpshape.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
-
 $(OBJS)\ogllib_canvas.o: ../../src/ogl/canvas.cpp
 	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-$(OBJS)\ogllib_composit.o: ../../src/ogl/composit.cpp
+$(OBJS)\ogllib_divided.o: ../../src/ogl/divided.cpp
 	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-$(OBJS)\ogllib_constrnt.o: ../../src/ogl/constrnt.cpp
+$(OBJS)\ogllib_mfutils.o: ../../src/ogl/mfutils.cpp
 	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-$(OBJS)\ogllib_divided.o: ../../src/ogl/divided.cpp
+$(OBJS)\ogllib_oglmisc.o: ../../src/ogl/oglmisc.cpp
 	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-$(OBJS)\ogllib_drawn.o: ../../src/ogl/drawn.cpp
+$(OBJS)\ogllib_basic.o: ../../src/ogl/basic.cpp
 	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-$(OBJS)\ogllib_dummy.o: ../../src/ogl/../../../src/msw/dummy.cpp
+$(OBJS)\ogllib_composit.o: ../../src/ogl/composit.cpp
 	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-$(OBJS)\ogllib_lines.o: ../../src/ogl/lines.cpp
+$(OBJS)\ogllib_drawn.o: ../../src/ogl/drawn.cpp
 	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-$(OBJS)\ogllib_mfutils.o: ../../src/ogl/mfutils.cpp
+$(OBJS)\ogllib_bmpshape.o: ../../src/ogl/bmpshape.cpp
 	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-$(OBJS)\ogllib_ogldiag.o: ../../src/ogl/ogldiag.cpp
+$(OBJS)\ogllib_constrnt.o: ../../src/ogl/constrnt.cpp
 	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-$(OBJS)\ogllib_oglmisc.o: ../../src/ogl/oglmisc.cpp
+$(OBJS)\ogllib_lines.o: ../../src/ogl/lines.cpp
 	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a
-	-if exist $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a del $(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a
-
-ifeq ($(SHARED),1)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)251$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll: $(OGLDLL_OBJECTS)
-	$(CXX) -shared -o $@ $(OGLDLL_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--out-implib,$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG)  -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG)  $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)
-endif
-
-ifeq ($(SHARED),0)
-$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a: $(OGLLIB_OBJECTS)
-	if exist $@ del $@
-	ar rcu $@ $(OGLLIB_OBJECTS)
-	ranlib $@
-endif
+$(OBJS)\ogllib_ogldiag.o: ../../src/ogl/ogldiag.cpp
+	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
 
 .PHONY: all clean