X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c9f8f91cd62335261ee29762747218f28d129de..6e2717981772a139d3cd9e51d497b13792fe662d:/contrib/build/ogl/makefile.wat?ds=sidebyside

diff --git a/contrib/build/ogl/makefile.wat b/contrib/build/ogl/makefile.wat
index c77d499cb7..8d9c008608 100644
--- a/contrib/build/ogl/makefile.wat
+++ b/contrib/build/ogl/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -214,8 +214,8 @@ __UNICODE_DEFINE_p = -d_UNICODE
 
 ### Variables: ###
 
-WX_RELEASE_NODOT = 25
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5
+WX_RELEASE_NODOT = 27
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
 OBJS = &
 	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = ..\..\src\ogl\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
@@ -224,7 +224,7 @@ SETUPHDIR = &
 OGLDLL_CXXFLAGS = -bd $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
 	$(__RUNTIME_LIBS) -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) -wx &
+	$(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\ogl\..\..\..\include -wx &
 	-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\ogl\..\..\include &
 	-dWXUSINGDLL -dWXMAKINGDLL_OGL /fh=$(OBJS)\wxprec_ogldll.pch $(__RTTIFLAG) &
 	$(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
@@ -245,7 +245,7 @@ OGLDLL_OBJECTS =  &
 OGLLIB_CXXFLAGS = $(__DEBUGINFO_1) $(__OPTIMIZEFLAG) $(__THREADSFLAG) &
 	$(__RUNTIME_LIBS) -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) -wx &
+	$(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\ogl\..\..\..\include -wx &
 	-wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=..\..\src\ogl\..\..\include &
 	/fh=$(OBJS)\wxprec_ogllib.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) &
 	$(CXXFLAGS)
@@ -291,7 +291,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
 	@%append $(OBJS)\ogldll.lbc option caseexact
 	@%append $(OBJS)\ogldll.lbc $(LDFLAGS) $(__DEBUGINFO_2)  libpath $(LIBDIRNAME)
 	@for %i in ($(OGLDLL_OBJECTS)) do @%append $(OBJS)\ogldll.lbc file %i
-	@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p) ) do @%append $(OBJS)\ogldll.lbc library %i
+	@for %i in ( $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)  wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p) ) do @%append $(OBJS)\ogldll.lbc library %i
 	@%append $(OBJS)\ogldll.lbc option resource=$(OBJS)\ogldll_version.res
 	@%append $(OBJS)\ogldll.lbc system nt_dll
 	wlink @$(OBJS)\ogldll.lbc
@@ -305,84 +305,84 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 	wlib -q -p4096 -n -b $^@ @$(OBJS)\ogllib.lbc
 !endif
 
-$(OBJS)\ogldll_dummy.obj :  .AUTODEPEND ../../src/ogl\..\..\..\src\msw\dummy.cpp
-	$(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+$(OBJS)\ogldll_dummy.obj :  .AUTODEPEND ../../src/ogl\..\..\..\src\common\dummy.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
-$(OBJS)\ogldll_version.res :  .AUTODEPEND ../../src/ogl\src\msw\version.rc
-	wrc -q -ad -bt=nt -r -fo=$^@   -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) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG) $<
+$(OBJS)\ogldll_version.res :  .AUTODEPEND ../../src/ogl\..\..\..\src\msw\version.rc
+	wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=..\..\src\ogl\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ogl_wat$(VENDORTAG) $<
 
 $(OBJS)\ogldll_basic2.obj :  .AUTODEPEND ../../src/ogl\basic2.cpp
-	$(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_canvas.obj :  .AUTODEPEND ../../src/ogl\canvas.cpp
-	$(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_divided.obj :  .AUTODEPEND ../../src/ogl\divided.cpp
-	$(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_mfutils.obj :  .AUTODEPEND ../../src/ogl\mfutils.cpp
-	$(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_oglmisc.obj :  .AUTODEPEND ../../src/ogl\oglmisc.cpp
-	$(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_basic.obj :  .AUTODEPEND ../../src/ogl\basic.cpp
-	$(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_composit.obj :  .AUTODEPEND ../../src/ogl\composit.cpp
-	$(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_drawn.obj :  .AUTODEPEND ../../src/ogl\drawn.cpp
-	$(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_bmpshape.obj :  .AUTODEPEND ../../src/ogl\bmpshape.cpp
-	$(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_constrnt.obj :  .AUTODEPEND ../../src/ogl\constrnt.cpp
-	$(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_lines.obj :  .AUTODEPEND ../../src/ogl\lines.cpp
-	$(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
 $(OBJS)\ogldll_ogldiag.obj :  .AUTODEPEND ../../src/ogl\ogldiag.cpp
-	$(CXX) -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLDLL_CXXFLAGS) $<
 
-$(OBJS)\ogllib_dummy.obj :  .AUTODEPEND ../../src/ogl\..\..\..\src\msw\dummy.cpp
-	$(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+$(OBJS)\ogllib_dummy.obj :  .AUTODEPEND ../../src/ogl\..\..\..\src\common\dummy.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_basic2.obj :  .AUTODEPEND ../../src/ogl\basic2.cpp
-	$(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_canvas.obj :  .AUTODEPEND ../../src/ogl\canvas.cpp
-	$(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_divided.obj :  .AUTODEPEND ../../src/ogl\divided.cpp
-	$(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_mfutils.obj :  .AUTODEPEND ../../src/ogl\mfutils.cpp
-	$(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_oglmisc.obj :  .AUTODEPEND ../../src/ogl\oglmisc.cpp
-	$(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_basic.obj :  .AUTODEPEND ../../src/ogl\basic.cpp
-	$(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_composit.obj :  .AUTODEPEND ../../src/ogl\composit.cpp
-	$(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_drawn.obj :  .AUTODEPEND ../../src/ogl\drawn.cpp
-	$(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_bmpshape.obj :  .AUTODEPEND ../../src/ogl\bmpshape.cpp
-	$(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_constrnt.obj :  .AUTODEPEND ../../src/ogl\constrnt.cpp
-	$(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_lines.obj :  .AUTODEPEND ../../src/ogl\lines.cpp
-	$(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
 
 $(OBJS)\ogllib_ogldiag.obj :  .AUTODEPEND ../../src/ogl\ogldiag.cpp
-	$(CXX) -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(OGLLIB_CXXFLAGS) $<