Create wxPrintAbortDialog more sensibly.

[wxWidgets.git] / samples / console / makefile.bcc

diff --git a/samples/console/makefile.bcc b/samples/console/makefile.bcc
index 10762ff68378438b1b20d892305840e9cc6ec8c4..9d6f3c3675454c866cb2e1b0834a1fdad1233379 100644 (file)
--- a/samples/console/makefile.bcc
+++ b/samples/console/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
-#     Bakefile 0.2.8 (http://www.bakefile.org)\r
+#     Bakefile 0.2.9 (http://www.bakefile.org)\r
 #     Do not modify, all changes will be overwritten!\r
 # =========================================================================\r
 \r
@@ -24,8 +24,9 @@ BCCDIR = $(MAKEDIR)\..
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = bcc\r
 OBJS = \\r
-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)\r
+       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 CONSOLE_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
@@ -46,6 +47,9 @@ PORTNAME = base
 !if "$(USE_GUI)" == "1"\r
 PORTNAME = msw\r
 !endif\r
+!if "$(OFFICIAL_BUILD)" == "1"
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+!endif
 !if "$(BUILD)" == "debug"\r
 WXDEBUGFLAG = d\r
 !endif\r
@@ -68,7 +72,7 @@ LIBTYPE_SUFFIX = dll
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !if "$(MONOLITHIC)" == "1"\r
-EXTRALIBS_FOR_BASE =  \r
+EXTRALIBS_FOR_BASE =   \r
 !endif\r
 !if "$(BUILD)" == "debug"\r
 __OPTIMIZEFLAG_2 = -Od\r
@@ -145,6 +149,12 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
+!if "$(MONOLITHIC)" == "1"\r
+__LIB_PNG_IF_MONO_p = $(__LIB_PNG_p)\r
+!endif\r
+!if "$(USE_GUI)" == "1"\r
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib\r
+!endif\r
 !if "$(MSLU)" == "1"\r
 __UNICOWS_LIB_p = unicows.lib\r
 !endif\r
@@ -174,7 +184,7 @@ $(OBJS):
 \r
 ### Targets: ###\r
 \r
-all: $(OBJS)\console.exe data\r
+all: $(OBJS)\console.exe\r
 \r
 clean: \r
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
@@ -189,13 +199,9 @@ clean:
 \r
 $(OBJS)\console.exe: $(CONSOLE_OBJECTS)\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -ap $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r
-       c0x32.obj $(CONSOLE_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,\r
+       c0x32.obj $(CONSOLE_OBJECTS),$@,, $(__WXLIB_NET_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_PNG_IF_MONO_p) wxzlib$(WXDEBUGFLAG).lib wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,,\r
 |\r
 \r
-data: \r
-       if not exist $(OBJS) mkdir $(OBJS)\r
-       for %f in (testdata.fc) do if not exist $(OBJS)\%f copy .\%f $(OBJS)\r
-\r
 $(OBJS)\console_console.obj: .\console.cpp\r
        $(CXX) -q -c -P -o$@ $(CONSOLE_CXXFLAGS) .\console.cpp\r
 \r