more wxFD_XXX renamings (patch 1488371)

[wxWidgets.git] / samples / access / makefile.wat

diff --git a/samples/access/makefile.wat b/samples/access/makefile.wat
index a5fd93aedf23fa35fdc7af09f4abbadc9afe2ab1..5003789c6b4cda6307f12d0535e3f29cc2acfc4a 100644 (file)
--- a/samples/access/makefile.wat
+++ b/samples/access/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.6 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -110,26 +110,33 @@ __OPTIMIZEFLAG_2 = -od
 !ifeq BUILD release
 __OPTIMIZEFLAG_2 = -ot -ox
 !endif
 !ifeq BUILD release
 __OPTIMIZEFLAG_2 = -ot -ox
 !endif

-__RUNTIME_LIBS_5 =
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =

 !ifeq RUNTIME_LIBS dynamic
 !ifeq RUNTIME_LIBS dynamic

-__RUNTIME_LIBS_5 = -br
+__RUNTIME_LIBS_6 = -br

 !endif
 !ifeq RUNTIME_LIBS static
 !endif
 !ifeq RUNTIME_LIBS static

-__RUNTIME_LIBS_5 = 
+__RUNTIME_LIBS_6 = 

 !endif
 !endif

-__EXCEPTIONSFLAG_6 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_6 = 
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 

 !endif
 !endif

-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_6 = -xr
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr

 !endif
 !endif

-__EXCEPTIONSFLAG_7 =
+__EXCEPTIONSFLAG_8 =

 !ifeq USE_EXCEPTIONS 0
 !ifeq USE_EXCEPTIONS 0

-__EXCEPTIONSFLAG_7 = 
+__EXCEPTIONSFLAG_8 = 

 !endif
 !ifeq USE_EXCEPTIONS 1
 !endif
 !ifeq USE_EXCEPTIONS 1

-__EXCEPTIONSFLAG_7 = -xs
+__EXCEPTIONSFLAG_8 = -xs

 !endif
 __WXLIB_CORE_p =
 !ifeq MONOLITHIC 0
 !endif
 __WXLIB_CORE_p =
 !ifeq MONOLITHIC 0


@@ -171,6 +178,18 @@ __DEBUG_DEFINE_p = -d__WXDEBUG__
 !ifeq DEBUG_FLAG 1
 __DEBUG_DEFINE_p = -d__WXDEBUG__
 !endif
 !ifeq DEBUG_FLAG 1
 __DEBUG_DEFINE_p = -d__WXDEBUG__
 !endif

+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif

 __UNICODE_DEFINE_p =
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE
 __UNICODE_DEFINE_p =
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE


@@ -182,17 +201,18 @@ __DLLFLAG_p = -dWXUSINGDLL
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-WX_RELEASE_NODOT = 25
+WX_RELEASE_NODOT = 27

 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

-ACCESSTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm &
-       $(__RUNTIME_LIBS_5) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
-       $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 &
+ACCESSTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+       $(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+       $(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -wx -wcd=549 &

        -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
        -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &

-       $(__EXCEPTIONSFLAG_6) $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
+       $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)

 ACCESSTEST_OBJECTS =  &
        $(OBJS)\accesstest_accesstest.obj
 
 ACCESSTEST_OBJECTS =  &
        $(OBJS)\accesstest_accesstest.obj
 


@@ -222,11 +242,12 @@ $(OBJS)\accesstest.exe :  $(ACCESSTEST_OBJECTS) $(OBJS)\accesstest_accesstest.re
        @for %i in ($(ACCESSTEST_OBJECTS)) do @%append $(OBJS)\accesstest.lbc file %i
        @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__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 ) do @%append $(OBJS)\accesstest.lbc library %i
        @%append $(OBJS)\accesstest.lbc option resource=$(OBJS)\accesstest_accesstest.res
        @for %i in ($(ACCESSTEST_OBJECTS)) do @%append $(OBJS)\accesstest.lbc file %i
        @for %i in ( $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__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 ) do @%append $(OBJS)\accesstest.lbc library %i
        @%append $(OBJS)\accesstest.lbc option resource=$(OBJS)\accesstest_accesstest.res

+       @for %i in () do @%append $(OBJS)\accesstest.lbc option stack=%i

        wlink @$(OBJS)\accesstest.lbc
 
 $(OBJS)\accesstest_accesstest.obj :  .AUTODEPEND .\accesstest.cpp
        wlink @$(OBJS)\accesstest.lbc
 
 $(OBJS)\accesstest_accesstest.obj :  .AUTODEPEND .\accesstest.cpp

-       $(CXX) -zq -fo=$^@ $(ACCESSTEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(ACCESSTEST_CXXFLAGS) $<

 
 $(OBJS)\accesstest_accesstest.res :  .AUTODEPEND .\accesstest.rc
 
 $(OBJS)\accesstest_accesstest.res :  .AUTODEPEND .\accesstest.rc

-       wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+       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=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<