blind fix for Unicode key handling (patch 1615989)

[wxWidgets.git] / contrib / build / foldbar / makefile.wat

diff --git a/contrib/build/foldbar/makefile.wat b/contrib/build/foldbar/makefile.wat
index 35430e7b3315cc5970208ad8da6db40149209e8c..c6dfdc1d3da5656ca30739e1f2bbaa287616a65c 100644 (file)
--- a/contrib/build/foldbar/makefile.wat
+++ b/contrib/build/foldbar/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -115,6 +115,10 @@ __LIB_PNG_p =
 !ifeq USE_GUI 1
 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
 __WXLIB_CORE_p =
 !ifeq MONOLITHIC 0
 __WXLIB_CORE_p = &
@@ -211,11 +215,15 @@ __UNICODE_DEFINE_p =
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE
 !endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
 
 ### Variables: ###
 
-WX_RELEASE_NODOT = 25
-WX_VERSION_NODOT = $(WX_RELEASE_NODOT)5
+WX_RELEASE_NODOT = 29
+WX_VERSION_NODOT = $(WX_RELEASE_NODOT)0
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = ..\..\src\foldbar\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
@@ -224,8 +232,8 @@ SETUPHDIR = &
 FOLDBARDLL_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\foldbar\..\..\..\include &
-       -i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=..\..\src\foldbar\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
        -i=..\..\src\foldbar\..\..\include -dWXUSINGDLL -dWXMAKINGDLL_FOLDBAR &
        /fh=$(OBJS)\wxprec_foldbardll.pch $(__RTTIFLAG) $(__EXCEPTIONSFLAG) &
        $(CPPFLAGS) $(CXXFLAGS)
@@ -237,8 +245,8 @@ FOLDBARDLL_OBJECTS =  &
 FOLDBARLIB_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\foldbar\..\..\..\include &
-       -i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
+       $(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+       -i=..\..\src\foldbar\..\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
        -i=..\..\src\foldbar\..\..\include /fh=$(OBJS)\wxprec_foldbarlib.pch &
        $(__RTTIFLAG) $(__EXCEPTIONSFLAG) $(CPPFLAGS) $(CXXFLAGS)
 FOLDBARLIB_OBJECTS =  &
@@ -274,7 +282,7 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXD
        @%append $(OBJS)\foldbardll.lbc option caseexact
        @%append $(OBJS)\foldbardll.lbc $(LDFLAGS) $(__DEBUGINFO_2)  libpath $(LIBDIRNAME)
        @for %i in ($(FOLDBARDLL_OBJECTS)) do @%append $(OBJS)\foldbardll.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)\foldbardll.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)  $(__GDIPLUS_LIB_p) 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)\foldbardll.lbc library %i
        @%append $(OBJS)\foldbardll.lbc option resource=$(OBJS)\foldbardll_version.res
        @%append $(OBJS)\foldbardll.lbc system nt_dll
        wlink @$(OBJS)\foldbardll.lbc
@@ -288,30 +296,30 @@ $(LIBDIRNAME)\wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXD
        wlib -q -p4096 -n -b $^@ @$(OBJS)\foldbarlib.lbc
 !endif
 
-$(OBJS)\foldbardll_dummy.obj :  .AUTODEPEND ../../src/foldbar\..\..\..\src\msw\dummy.cpp
-       $(CXX) -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
+$(OBJS)\foldbardll_dummy.obj :  .AUTODEPEND ../../src/foldbar\..\..\..\src\common\dummy.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
 
-$(OBJS)\foldbardll_version.res :  .AUTODEPEND ../../src/foldbar\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\foldbar\..\..\..\include -i=$(SETUPHDIR) -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_wat$(VENDORTAG) $<
+$(OBJS)\foldbardll_version.res :  .AUTODEPEND ../../src/foldbar\..\..\..\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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=..\..\src\foldbar\..\..\..\include -dWXDLLNAME=wx$(PORTNAME)$(WXUNIVNAME)$(WX_VERSION_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar_wat$(VENDORTAG) $<
 
 $(OBJS)\foldbardll_captionbar.obj :  .AUTODEPEND ../../src/foldbar\captionbar.cpp
-       $(CXX) -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
 
 $(OBJS)\foldbardll_foldpanelbar.obj :  .AUTODEPEND ../../src/foldbar\foldpanelbar.cpp
-       $(CXX) -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
 
 $(OBJS)\foldbardll_foldpanelitem.obj :  .AUTODEPEND ../../src/foldbar\foldpanelitem.cpp
-       $(CXX) -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARDLL_CXXFLAGS) $<
 
-$(OBJS)\foldbarlib_dummy.obj :  .AUTODEPEND ../../src/foldbar\..\..\..\src\msw\dummy.cpp
-       $(CXX) -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
+$(OBJS)\foldbarlib_dummy.obj :  .AUTODEPEND ../../src/foldbar\..\..\..\src\common\dummy.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
 
 $(OBJS)\foldbarlib_captionbar.obj :  .AUTODEPEND ../../src/foldbar\captionbar.cpp
-       $(CXX) -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
 
 $(OBJS)\foldbarlib_foldpanelbar.obj :  .AUTODEPEND ../../src/foldbar\foldpanelbar.cpp
-       $(CXX) -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
 
 $(OBJS)\foldbarlib_foldpanelitem.obj :  .AUTODEPEND ../../src/foldbar\foldpanelitem.cpp
-       $(CXX) -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(FOLDBARLIB_CXXFLAGS) $<