make Ok button in the dialog the default one as people expect it (see bug 1582051)

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

diff --git a/samples/docvwmdi/makefile.bcc b/samples/docvwmdi/makefile.bcc
index d3d838d59507652a12c383668e1d7a523319b456..cd4f9074ba07f5ecdead05c4586e792dc0ecfa0c 100644 (file)
--- a/samples/docvwmdi/makefile.bcc
+++ b/samples/docvwmdi/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -21,21 +21,22 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Variables: ###
 
-WX_RELEASE_NODOT = 26
+WX_RELEASE_NODOT = 28
 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = .\..\..\lib\bcc_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-DOCVIEW_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
+DOCVWMDI_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \
-       -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
-DOCVIEW_OBJECTS =  \
-       $(OBJS)\docview_docview.obj \
-       $(OBJS)\docview_doc.obj \
-       $(OBJS)\docview_view.obj
+       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
+       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include -I. $(__DLLFLAG_p) \
+       -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)
+DOCVWMDI_OBJECTS =  \
+       $(OBJS)\docvwmdi_docview.obj \
+       $(OBJS)\docvwmdi_doc.obj \
+       $(OBJS)\docvwmdi_view.obj
 
 ### Conditionally set variables: ###
 
@@ -144,6 +145,18 @@ __UNICODE_DEFINE_p = -D_UNICODE
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p_1 = -d_UNICODE
 !endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(MSLU)" == "1"
+__MSLU_DEFINE_p_1 = -dwxUSE_UNICODE_MSLU=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
+!endif
+!if "$(USE_GDIPLUS)" == "1"
+__GFXCTX_DEFINE_p_1 = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
 !if "$(SHARED)" == "1"
 __DLLFLAG_p = -DWXUSINGDLL
 !endif
@@ -174,6 +187,9 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib
 !endif
+!if "$(USE_GDIPLUS)" == "1"
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
 __DEBUGINFO = -v
 !endif
@@ -194,33 +210,33 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\docview.exe
+all: $(OBJS)\docvwmdi.exe
 
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.csm del $(OBJS)\*.csm
-       -if exist $(OBJS)\docview.exe del $(OBJS)\docview.exe
-       -if exist $(OBJS)\docview.tds del $(OBJS)\docview.tds
-       -if exist $(OBJS)\docview.ilc del $(OBJS)\docview.ilc
-       -if exist $(OBJS)\docview.ild del $(OBJS)\docview.ild
-       -if exist $(OBJS)\docview.ilf del $(OBJS)\docview.ilf
-       -if exist $(OBJS)\docview.ils del $(OBJS)\docview.ils
-
-$(OBJS)\docview.exe: $(DOCVIEW_OBJECTS)  $(OBJS)\docview_docview.res
+       -if exist $(OBJS)\docvwmdi.exe del $(OBJS)\docvwmdi.exe
+       -if exist $(OBJS)\docvwmdi.tds del $(OBJS)\docvwmdi.tds
+       -if exist $(OBJS)\docvwmdi.ilc del $(OBJS)\docvwmdi.ilc
+       -if exist $(OBJS)\docvwmdi.ild del $(OBJS)\docvwmdi.ild
+       -if exist $(OBJS)\docvwmdi.ilf del $(OBJS)\docvwmdi.ilf
+       -if exist $(OBJS)\docvwmdi.ils del $(OBJS)\docvwmdi.ils
+
+$(OBJS)\docvwmdi.exe: $(DOCVWMDI_OBJECTS)  $(OBJS)\docvwmdi_docview.res
        ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-       c0w32.obj $(DOCVIEW_OBJECTS),$@,, $(__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) $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\docview_docview.res
+       c0w32.obj $(DOCVWMDI_OBJECTS),$@,, $(__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) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\docvwmdi_docview.res
 |
 
-$(OBJS)\docview_docview.obj: .\docview.cpp
-       $(CXX) -q -c -P -o$@ $(DOCVIEW_CXXFLAGS) $**
+$(OBJS)\docvwmdi_docview.obj: .\docview.cpp
+       $(CXX) -q -c -P -o$@ $(DOCVWMDI_CXXFLAGS) $**
 
-$(OBJS)\docview_doc.obj: .\doc.cpp
-       $(CXX) -q -c -P -o$@ $(DOCVIEW_CXXFLAGS) $**
+$(OBJS)\docvwmdi_doc.obj: .\doc.cpp
+       $(CXX) -q -c -P -o$@ $(DOCVWMDI_CXXFLAGS) $**
 
-$(OBJS)\docview_view.obj: .\view.cpp
-       $(CXX) -q -c -P -o$@ $(DOCVIEW_CXXFLAGS) $**
+$(OBJS)\docvwmdi_view.obj: .\view.cpp
+       $(CXX) -q -c -P -o$@ $(DOCVWMDI_CXXFLAGS) $**
 
-$(OBJS)\docview_docview.res: .\docview.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) -i.\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH $**
+$(OBJS)\docvwmdi_docview.res: .\docview.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 $**