X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd9f42b6a94f9d68c66cf363093442b12cd4e953..1c2ed09a15a5eccaa1f78d3c57a597c13ba9f8f1:/contrib/build/ogl/makefile.gcc

diff --git a/contrib/build/ogl/makefile.gcc b/contrib/build/ogl/makefile.gcc
index d59f7049df..112e6365fd 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.9 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -12,19 +12,23 @@ include ../../../build/msw/config.gcc
 
 ### Variables: ###
 
-LIBDIRNAME = \
-	..\..\src\ogl\..\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+CPPDEPS = -MT$@ -MF$@.d -MD
+WX_RELEASE_NODOT = 26
 OBJS = \
 	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-OGLDLL_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\gcc_$(LIBTYPE_SUFFIX)$(CFG)
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+OGLDLL_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
 	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(LIBDIRNAME) \
-	-I..\..\src\ogl\..\..\..\src\tiff -I..\..\src\ogl\..\..\..\src\jpeg \
-	-I..\..\src\ogl\..\..\..\src\png -I..\..\src\ogl\..\..\..\src\zlib \
-	-I..\..\src\ogl\..\..\..\src\regex -I..\..\src\ogl\..\..\..\src\expat\lib \
-	-I..\..\src\ogl\..\..\include -DWXUSINGDLL -DWXMAKINGDLL_OGL $(CXXFLAGS)
+	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+	$(__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 \
 	$(OBJS)\ogldll_basic2.o \
 	$(OBJS)\ogldll_canvas.o \
 	$(OBJS)\ogldll_divided.o \
@@ -37,13 +41,12 @@ OGLDLL_OBJECTS =  \
 	$(OBJS)\ogldll_constrnt.o \
 	$(OBJS)\ogldll_lines.o \
 	$(OBJS)\ogldll_ogldiag.o
-OGLLIB_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(GCCFLAGS) \
+OGLLIB_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG) $(__THREADSFLAG) $(GCCFLAGS) \
 	-DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-	$(__UNICODE_DEFINE_p) -I..\..\src\ogl\..\..\..\include -I$(LIBDIRNAME) \
-	-I..\..\src\ogl\..\..\..\src\tiff -I..\..\src\ogl\..\..\..\src\jpeg \
-	-I..\..\src\ogl\..\..\..\src\png -I..\..\src\ogl\..\..\..\src\zlib \
-	-I..\..\src\ogl\..\..\..\src\regex -I..\..\src\ogl\..\..\..\src\expat\lib \
-	-I..\..\src\ogl\..\..\include $(CXXFLAGS)
+	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+	$(__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 \
@@ -84,38 +87,63 @@ 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 ($(BUILD),debug)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = -g
+ifeq ($(SHARED),1)
+WXDLLFLAG = dll
 endif
+ifeq ($(SHARED),0)
+LIBTYPE_SUFFIX = lib
 endif
-ifeq ($(BUILD),release)
-ifeq ($(DEBUG_INFO),default)
-__DEBUGINFO = 
+ifeq ($(SHARED),1)
+LIBTYPE_SUFFIX = dll
+endif
+ifeq ($(MONOLITHIC),0)
+EXTRALIBS_FOR_BASE = 
 endif
+ifeq ($(MONOLITHIC),1)
+EXTRALIBS_FOR_BASE =  
 endif
-ifeq ($(DEBUG_INFO),0)
-__DEBUGINFO = 
+ifeq ($(SHARED),1)
+__ogldll___depname = \
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_gcc$(VENDORTAG).dll
 endif
-ifeq ($(DEBUG_INFO),1)
-__DEBUGINFO = -g
+ifeq ($(WXUNIV),1)
+__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 ifeq ($(BUILD),debug)
 ifeq ($(DEBUG_FLAG),default)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
+__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
 endif
 endif
 ifeq ($(DEBUG_FLAG),1)
-__DEBUG_DEFINE_p = -D__WXDEBUG__
+__DEBUG_DEFINE_p_1 = --define __WXDEBUG__
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p_1 = --define wxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p_1 = --define wxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p_1 = --define wxNO_THREADS
+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)
+endif
+ifeq ($(USE_GUI),1)
+__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
 endif
 ifeq ($(USE_GUI),1)
 __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
@@ -123,8 +151,36 @@ endif
 ifeq ($(USE_GUI),1)
 __LIB_PNG_p = -lwxpng$(WXDEBUGFLAG)
 endif
-ifeq ($(USE_GUI),1)
-__LIB_TIFF_p = -lwxtiff$(WXDEBUGFLAG)
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_CORE_p = \
+	-lwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core
+endif
+ifeq ($(MONOLITHIC),0)
+__WXLIB_BASE_p = \
+	-lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+endif
+ifeq ($(SHARED),0)
+__ogllib___depname = \
+	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a
+endif
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = -g
+endif
+endif
+ifeq ($(BUILD),release)
+ifeq ($(DEBUG_INFO),default)
+__DEBUGINFO = 
+endif
+endif
+ifeq ($(DEBUG_INFO),0)
+__DEBUGINFO = 
+endif
+ifeq ($(DEBUG_INFO),1)
+__DEBUGINFO = -g
 endif
 ifeq ($(BUILD),debug)
 __OPTIMIZEFLAG = -O0
@@ -132,33 +188,50 @@ endif
 ifeq ($(BUILD),release)
 __OPTIMIZEFLAG = -O2
 endif
-ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+ifeq ($(USE_THREADS),0)
+__THREADSFLAG = 
 endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_BASE_p = -lwxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ifeq ($(USE_THREADS),1)
+__THREADSFLAG = -mthreads
 endif
-ifeq ($(MONOLITHIC),0)
-__WXLIB_CORE_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core
+ifeq ($(USE_RTTI),0)
+__RTTIFLAG = -fno-rtti
 endif
-ifeq ($(MONOLITHIC),1)
-__WXLIB_MONO_p = \
-	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+ifeq ($(USE_RTTI),1)
+__RTTIFLAG = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG = 
 endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
-ifeq ($(SHARED),1)
-__ogldll___depname = \
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll
+ifeq ($(BUILD),debug)
+ifeq ($(DEBUG_FLAG),default)
+__DEBUG_DEFINE_p = -D__WXDEBUG__
 endif
-ifeq ($(SHARED),0)
-__ogllib___depname = \
-	$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.a
 endif
-
-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) VENDOR=$(VENDOR) WXUNIV=$(WXUNIV)
+ifeq ($(DEBUG_FLAG),1)
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
+endif
+ifeq ($(USE_RTTI),0)
+__RTTI_DEFINE_p = -DwxNO_RTTI
+endif
+ifeq ($(USE_THREADS),0)
+__THREAD_DEFINE_p = -DwxNO_THREADS
+endif
+ifeq ($(UNICODE),1)
+__UNICODE_DEFINE_p = -D_UNICODE
+endif
+ifeq ($(MSLU),1)
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+endif
 
 
 all: $(OBJS)
@@ -169,100 +242,108 @@ $(OBJS):
 
 all: $(__ogldll___depname) $(__ogllib___depname)
 
-$(OBJS)\ogldll_basic.o: ../../src/ogl\basic.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+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
 
-$(OBJS)\ogldll_basic2.o: ../../src/ogl\basic2.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+ifeq ($(SHARED),1)
+$(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
 
-$(OBJS)\ogldll_bmpshape.o: ../../src/ogl\bmpshape.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+ifeq ($(SHARED),0)
+$(LIBDIRNAME)\libwx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl.a: $(OGLLIB_OBJECTS)
+	if exist $@ del $@
+	ar rcu $@ $(OGLLIB_OBJECTS)
+	ranlib $@
+endif
 
-$(OBJS)\ogldll_canvas.o: ../../src/ogl\canvas.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+$(OBJS)\ogldll_dummy.o: ../../src/ogl/../../../src/msw/dummy.cpp
+	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogldll_composit.o: ../../src/ogl\composit.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+$(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_constrnt.o: ../../src/ogl\constrnt.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+$(OBJS)\ogldll_basic2.o: ../../src/ogl/basic2.cpp
+	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogldll_divided.o: ../../src/ogl\divided.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+$(OBJS)\ogldll_canvas.o: ../../src/ogl/canvas.cpp
+	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogldll_drawn.o: ../../src/ogl\drawn.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+$(OBJS)\ogldll_divided.o: ../../src/ogl/divided.cpp
+	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogldll_dummy.o: ../../src/ogl\..\..\..\src\msw\dummy.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+$(OBJS)\ogldll_mfutils.o: ../../src/ogl/mfutils.cpp
+	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogldll_lines.o: ../../src/ogl\lines.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+$(OBJS)\ogldll_oglmisc.o: ../../src/ogl/oglmisc.cpp
+	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogldll_mfutils.o: ../../src/ogl\mfutils.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+$(OBJS)\ogldll_basic.o: ../../src/ogl/basic.cpp
+	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogldll_ogldiag.o: ../../src/ogl\ogldiag.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+$(OBJS)\ogldll_composit.o: ../../src/ogl/composit.cpp
+	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogldll_oglmisc.o: ../../src/ogl\oglmisc.cpp
-	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $<
+$(OBJS)\ogldll_drawn.o: ../../src/ogl/drawn.cpp
+	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogllib_basic.o: ../../src/ogl\basic.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+$(OBJS)\ogldll_bmpshape.o: ../../src/ogl/bmpshape.cpp
+	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogllib_basic2.o: ../../src/ogl\basic2.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+$(OBJS)\ogldll_constrnt.o: ../../src/ogl/constrnt.cpp
+	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogllib_bmpshape.o: ../../src/ogl\bmpshape.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+$(OBJS)\ogldll_lines.o: ../../src/ogl/lines.cpp
+	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogllib_canvas.o: ../../src/ogl\canvas.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+$(OBJS)\ogldll_ogldiag.o: ../../src/ogl/ogldiag.cpp
+	$(CXX) -c -o $@ $(OGLDLL_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogllib_composit.o: ../../src/ogl\composit.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+$(OBJS)\ogllib_dummy.o: ../../src/ogl/../../../src/msw/dummy.cpp
+	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogllib_constrnt.o: ../../src/ogl\constrnt.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+$(OBJS)\ogllib_basic2.o: ../../src/ogl/basic2.cpp
+	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogllib_divided.o: ../../src/ogl\divided.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+$(OBJS)\ogllib_canvas.o: ../../src/ogl/canvas.cpp
+	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogllib_drawn.o: ../../src/ogl\drawn.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+$(OBJS)\ogllib_divided.o: ../../src/ogl/divided.cpp
+	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogllib_dummy.o: ../../src/ogl\..\..\..\src\msw\dummy.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+$(OBJS)\ogllib_mfutils.o: ../../src/ogl/mfutils.cpp
+	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogllib_lines.o: ../../src/ogl\lines.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+$(OBJS)\ogllib_oglmisc.o: ../../src/ogl/oglmisc.cpp
+	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogllib_mfutils.o: ../../src/ogl\mfutils.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+$(OBJS)\ogllib_basic.o: ../../src/ogl/basic.cpp
+	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogllib_ogldiag.o: ../../src/ogl\ogldiag.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+$(OBJS)\ogllib_composit.o: ../../src/ogl/composit.cpp
+	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\ogllib_oglmisc.o: ../../src/ogl\oglmisc.cpp
-	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $<
+$(OBJS)\ogllib_drawn.o: ../../src/ogl/drawn.cpp
+	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
-clean: 
-	-if exist $(OBJS)\*.o del $(OBJS)\*.o
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl_gcc$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(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
+$(OBJS)\ogllib_bmpshape.o: ../../src/ogl/bmpshape.cpp
+	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
-ifeq ($(SHARED),1)
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)250$(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)  -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32  $(__WXLIB_CORE_p) $(__WXLIB_BASE_p)
-endif
+$(OBJS)\ogllib_constrnt.o: ../../src/ogl/constrnt.cpp
+	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
-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_lines.o: ../../src/ogl/lines.cpp
+	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\ogllib_ogldiag.o: ../../src/ogl/ogldiag.cpp
+	$(CXX) -c -o $@ $(OGLLIB_CXXFLAGS) $(CPPDEPS) $<
 
 .PHONY: all clean
+
+
+# Dependencies tracking:
+-include $(OBJS)/*.d