X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2113bc7764ea7a0b1a6682ce3275b6f06f036ab3..65baafba0e8cd74f2264b7e2f7625ff5bea84864:/contrib/build/fl/makefile.wat

diff --git a/contrib/build/fl/makefile.wat b/contrib/build/fl/makefile.wat
index da740bbf3e..7d1c4b30c6 100644
--- a/contrib/build/fl/makefile.wat
+++ b/contrib/build/fl/makefile.wat
@@ -79,7 +79,7 @@ EXTRALIBS_FOR_BASE =
 __fldll___depname =
 !ifeq SHARED 1
 __fldll___depname = &
-	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG).dll
+	$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG).dll
 !endif
 __DEBUGINFO_2 =
 !ifeq BUILD debug
@@ -214,7 +214,8 @@ __UNICODE_DEFINE_p = -d_UNICODE
 
 ### Variables: ###
 
-WX_RELEASE_NODOT = 26
+WX_RELEASE_NODOT = 27
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
 OBJS = &
 	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = ..\..\src\fl\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
@@ -288,12 +289,12 @@ clean : .SYMBOLIC
 	-if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
 	-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
 	-if exist $(OBJS)\*.pch del $(OBJS)\*.pch
-	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG).dll
+	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG).dll del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG).dll
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
 	-if exist $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib del $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib
 
 !ifeq SHARED 1
-$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG).dll :  $(FLDLL_OBJECTS) $(OBJS)\fldll_version.res
+$(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG).dll :  $(FLDLL_OBJECTS) $(OBJS)\fldll_version.res
 	@%create $(OBJS)\fldll.lbc
 	@%append $(OBJS)\fldll.lbc option quiet
 	@%append $(OBJS)\fldll.lbc name $^@
@@ -302,7 +303,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 	@for %i in ($(FLDLL_OBJECTS)) do @%append $(OBJS)\fldll.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)\fldll.lbc library %i
 	@%append $(OBJS)\fldll.lbc option resource=$(OBJS)\fldll_version.res
-	@%append $(OBJS)\fldll.lbc system nt_dll
+	@%append $(OBJS)\fldll.lbc system nr_dll
 	wlink @$(OBJS)\fldll.lbc
 	wlib -q -n -b $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl.lib +$^@
 !endif
@@ -315,113 +316,113 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
 !endif
 
 $(OBJS)\fldll_dummy.obj :  .AUTODEPEND ../../src/fl\..\..\..\src\msw\dummy.cpp
-	$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
 
 $(OBJS)\fldll_version.res :  .AUTODEPEND ../../src/fl\..\..\..\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\fl\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG) $<
+	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\fl\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_fl_wat$(VENDORTAG) $<
 
 $(OBJS)\fldll_antiflickpl.obj :  .AUTODEPEND ../../src/fl\antiflickpl.cpp
-	$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
 
 $(OBJS)\fldll_bardragpl.obj :  .AUTODEPEND ../../src/fl\bardragpl.cpp
-	$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
 
 $(OBJS)\fldll_barhintspl.obj :  .AUTODEPEND ../../src/fl\barhintspl.cpp
-	$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
 
 $(OBJS)\fldll_cbcustom.obj :  .AUTODEPEND ../../src/fl\cbcustom.cpp
-	$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
 
 $(OBJS)\fldll_controlbar.obj :  .AUTODEPEND ../../src/fl\controlbar.cpp
-	$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
 
 $(OBJS)\fldll_dyntbar.obj :  .AUTODEPEND ../../src/fl\dyntbar.cpp
-	$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
 
 $(OBJS)\fldll_dyntbarhnd.obj :  .AUTODEPEND ../../src/fl\dyntbarhnd.cpp
-	$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
 
 $(OBJS)\fldll_frmview.obj :  .AUTODEPEND ../../src/fl\frmview.cpp
-	$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
 
 $(OBJS)\fldll_garbagec.obj :  .AUTODEPEND ../../src/fl\garbagec.cpp
-	$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
 
 $(OBJS)\fldll_gcupdatesmgr.obj :  .AUTODEPEND ../../src/fl\gcupdatesmgr.cpp
-	$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
 
 $(OBJS)\fldll_hintanimpl.obj :  .AUTODEPEND ../../src/fl\hintanimpl.cpp
-	$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
 
 $(OBJS)\fldll_newbmpbtn.obj :  .AUTODEPEND ../../src/fl\newbmpbtn.cpp
-	$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
 
 $(OBJS)\fldll_panedrawpl.obj :  .AUTODEPEND ../../src/fl\panedrawpl.cpp
-	$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
 
 $(OBJS)\fldll_rowdragpl.obj :  .AUTODEPEND ../../src/fl\rowdragpl.cpp
-	$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
 
 $(OBJS)\fldll_rowlayoutpl.obj :  .AUTODEPEND ../../src/fl\rowlayoutpl.cpp
-	$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
 
 $(OBJS)\fldll_toolwnd.obj :  .AUTODEPEND ../../src/fl\toolwnd.cpp
-	$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
 
 $(OBJS)\fldll_updatesmgr.obj :  .AUTODEPEND ../../src/fl\updatesmgr.cpp
-	$(CXX) -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLDLL_CXXFLAGS) $<
 
 $(OBJS)\fllib_dummy.obj :  .AUTODEPEND ../../src/fl\..\..\..\src\msw\dummy.cpp
-	$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
 
 $(OBJS)\fllib_antiflickpl.obj :  .AUTODEPEND ../../src/fl\antiflickpl.cpp
-	$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
 
 $(OBJS)\fllib_bardragpl.obj :  .AUTODEPEND ../../src/fl\bardragpl.cpp
-	$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
 
 $(OBJS)\fllib_barhintspl.obj :  .AUTODEPEND ../../src/fl\barhintspl.cpp
-	$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
 
 $(OBJS)\fllib_cbcustom.obj :  .AUTODEPEND ../../src/fl\cbcustom.cpp
-	$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
 
 $(OBJS)\fllib_controlbar.obj :  .AUTODEPEND ../../src/fl\controlbar.cpp
-	$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
 
 $(OBJS)\fllib_dyntbar.obj :  .AUTODEPEND ../../src/fl\dyntbar.cpp
-	$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
 
 $(OBJS)\fllib_dyntbarhnd.obj :  .AUTODEPEND ../../src/fl\dyntbarhnd.cpp
-	$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
 
 $(OBJS)\fllib_frmview.obj :  .AUTODEPEND ../../src/fl\frmview.cpp
-	$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
 
 $(OBJS)\fllib_garbagec.obj :  .AUTODEPEND ../../src/fl\garbagec.cpp
-	$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
 
 $(OBJS)\fllib_gcupdatesmgr.obj :  .AUTODEPEND ../../src/fl\gcupdatesmgr.cpp
-	$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
 
 $(OBJS)\fllib_hintanimpl.obj :  .AUTODEPEND ../../src/fl\hintanimpl.cpp
-	$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
 
 $(OBJS)\fllib_newbmpbtn.obj :  .AUTODEPEND ../../src/fl\newbmpbtn.cpp
-	$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
 
 $(OBJS)\fllib_panedrawpl.obj :  .AUTODEPEND ../../src/fl\panedrawpl.cpp
-	$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
 
 $(OBJS)\fllib_rowdragpl.obj :  .AUTODEPEND ../../src/fl\rowdragpl.cpp
-	$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
 
 $(OBJS)\fllib_rowlayoutpl.obj :  .AUTODEPEND ../../src/fl\rowlayoutpl.cpp
-	$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
 
 $(OBJS)\fllib_toolwnd.obj :  .AUTODEPEND ../../src/fl\toolwnd.cpp
-	$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
 
 $(OBJS)\fllib_updatesmgr.obj :  .AUTODEPEND ../../src/fl\updatesmgr.cpp
-	$(CXX) -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FLLIB_CXXFLAGS) $<