Applied better/Win98-proof method of getting edit window

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

diff --git a/samples/dataview/makefile.wat b/samples/dataview/makefile.wat
index ab0951769cdce649aca1568657d32e9672eb74bd..0d06f71ed92b678e8ef8510f1b60fbe686f128ff 100644 (file)
--- a/samples/dataview/makefile.wat
+++ b/samples/dataview/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.2.5 (http://www.bakefile.org)
+#     Bakefile 0.2.6 (http://www.bakefile.org)

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


@@ -18,7 +18,11 @@
 !  loaddll wpp      wppdi86
 !  loaddll wppaxp   wppdaxp
 !  loaddll wpp386   wppd386
 !  loaddll wpp      wppdi86
 !  loaddll wppaxp   wppdaxp
 !  loaddll wpp386   wppd386

+! if $(__VERSION__) >= 1280
+!  loaddll wlink    wlinkd
+! else

 !  loaddll wlink    wlink
 !  loaddll wlink    wlink

+! endif

 !  loaddll wlib     wlibd
 !endif
 
 !  loaddll wlib     wlibd
 !endif
 


@@ -36,11 +40,6 @@ PORTNAME = msw
 !endif
 WXDEBUGFLAG =
 !ifeq BUILD debug
 !endif
 WXDEBUGFLAG =
 !ifeq BUILD debug

-!ifeq DEBUG_FLAG default
-WXDEBUGFLAG = d
-!endif
-!endif
-!ifeq DEBUG_FLAG 1

 WXDEBUGFLAG = d
 !endif
 WXUNICODEFLAG =
 WXDEBUGFLAG = d
 !endif
 WXUNICODEFLAG =


@@ -179,13 +178,8 @@ __WXUNIV_DEFINE_p =
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 !endif
 __DEBUG_DEFINE_p =
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
 !endif
 __DEBUG_DEFINE_p =

-!ifeq BUILD debug
-!ifeq DEBUG_FLAG default
-__DEBUG_DEFINE_p = -d__WXDEBUG__
-!endif
-!endif
-!ifeq DEBUG_FLAG 1
-__DEBUG_DEFINE_p = -d__WXDEBUG__
+!ifeq DEBUG_FLAG 0
+__DEBUG_DEFINE_p = -dwxDEBUG_LEVEL=0

 !endif
 __EXCEPTIONS_DEFINE_p =
 !ifeq USE_EXCEPTIONS 0
 !endif
 __EXCEPTIONS_DEFINE_p =
 !ifeq USE_EXCEPTIONS 0


@@ -232,7 +226,8 @@ DATAVIEW_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
        -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
        $(CXXFLAGS)
 DATAVIEW_OBJECTS =  &
        -i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
        $(CXXFLAGS)
 DATAVIEW_OBJECTS =  &

-       $(OBJS)\dataview_dataview.obj
+       $(OBJS)\dataview_dataview.obj &
+       $(OBJS)\dataview_mymodels.obj

 
 
 all : $(OBJS)
 
 
 all : $(OBJS)


@@ -266,6 +261,9 @@ $(OBJS)\dataview.exe :  $(DATAVIEW_OBJECTS) $(OBJS)\dataview_sample.res
 $(OBJS)\dataview_dataview.obj :  .AUTODEPEND .\dataview.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(DATAVIEW_CXXFLAGS) $<
 
 $(OBJS)\dataview_dataview.obj :  .AUTODEPEND .\dataview.cpp
        $(CXX) -bt=nt -zq -fo=$^@ $(DATAVIEW_CXXFLAGS) $<
 

+$(OBJS)\dataview_mymodels.obj :  .AUTODEPEND .\mymodels.cpp
+       $(CXX) -bt=nt -zq -fo=$^@ $(DATAVIEW_CXXFLAGS) $<
+

 $(OBJS)\dataview_sample.res :  .AUTODEPEND .\..\sample.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=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
 
 $(OBJS)\dataview_sample.res :  .AUTODEPEND .\..\sample.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=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<