X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/506e9b7ed2bee097fd3674061f6962e54bdea7bf..6a3f8b4f1f1c802df93ce7bc05588536cb7a4dad:/samples/image/makefile.bcc?ds=sidebyside

diff --git a/samples/image/makefile.bcc b/samples/image/makefile.bcc
index 4be10fa100..0360bd0290 100644
--- a/samples/image/makefile.bcc
+++ b/samples/image/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     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!
 # =========================================================================
 
@@ -35,7 +35,8 @@ IMAGE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
 	$(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
 	-I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
 IMAGE_OBJECTS =  \
-	$(OBJS)\image_image.obj
+	$(OBJS)\image_image.obj \
+	$(OBJS)\image_canvas.obj
 
 ### Conditionally set variables: ###
 
@@ -45,10 +46,7 @@ PORTNAME = base
 !if "$(USE_GUI)" == "1"
 PORTNAME = msw
 !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-WXDEBUGFLAG = d
-!endif
-!if "$(DEBUG_FLAG)" == "1"
+!if "$(BUILD)" == "debug"
 WXDEBUGFLAG = d
 !endif
 !if "$(UNICODE)" == "1"
@@ -108,17 +106,11 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
 !endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p = -D__WXDEBUG__
-!endif
-!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
-!endif
-!if "$(DEBUG_FLAG)" == "1"
-__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
+!if "$(DEBUG_FLAG)" == "0"
+__DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
 !endif
 !if "$(USE_EXCEPTIONS)" == "0"
 __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
@@ -240,6 +232,9 @@ data:
 $(OBJS)\image_image.obj: .\image.cpp
 	$(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\image.cpp
 
+$(OBJS)\image_canvas.obj: .\canvas.cpp
+	$(CXX) -q -c -P -o$@ $(IMAGE_CXXFLAGS) .\canvas.cpp
+
 $(OBJS)\image_image.res: .\image.rc
 	brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\image.rc