XRC spec: document wxRibbon* XRC handler.

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

diff --git a/samples/xrc/makefile.bcc b/samples/xrc/makefile.bcc
index 73e9da221ffd1f5aff9479dfd7e0e824adcb3e7d..c564d7eeb929fcef25624eab45bd8ab34b756cca 100644 (file)
--- a/samples/xrc/makefile.bcc
+++ b/samples/xrc/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================\r
 #     This makefile was generated by\r
 # =========================================================================\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
 #     Do not modify, all changes will be overwritten!\r
 # =========================================================================\r
 \r


@@ -21,11 +21,12 @@ BCCDIR = $(MAKEDIR)\..
 \r
 ### Variables: ###\r
 \r
 \r
 ### Variables: ###\r
 \r

-WX_RELEASE_NODOT = 29\r
+WX_RELEASE_NODOT = 30\r

 COMPILER_PREFIX = bcc\r
 OBJS = \\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)\r
+LIBDIRNAME = \\r
+       .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)\r

 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 XRCDEMO_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 XRCDEMO_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r


@@ -39,7 +40,8 @@ XRCDEMO_OBJECTS =  \
        $(OBJS)\xrcdemo_xrcdemo.obj \\r
        $(OBJS)\xrcdemo_myframe.obj \\r
        $(OBJS)\xrcdemo_derivdlg.obj \\r
        $(OBJS)\xrcdemo_xrcdemo.obj \\r
        $(OBJS)\xrcdemo_myframe.obj \\r
        $(OBJS)\xrcdemo_derivdlg.obj \\r

-       $(OBJS)\xrcdemo_custclas.obj\r
+       $(OBJS)\xrcdemo_custclas.obj \\r
+       $(OBJS)\xrcdemo_objrefdlg.obj\r

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -47,7 +49,10 @@ XRCDEMO_OBJECTS =  \
 PORTNAME = base\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r
 PORTNAME = base\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

-PORTNAME = msw\r
+PORTNAME = msw$(TOOLKIT_VERSION)\r
+!endif\r
+!if "$(OFFICIAL_BUILD)" == "1"\r
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD\r

 !endif\r
 !if "$(BUILD)" == "debug"\r
 WXDEBUGFLAG = d\r
 !endif\r
 !if "$(BUILD)" == "debug"\r
 WXDEBUGFLAG = d\r


@@ -71,7 +76,7 @@ LIBTYPE_SUFFIX = dll
 EXTRALIBS_FOR_BASE = \r
 !endif\r
 !if "$(MONOLITHIC)" == "1"\r
 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
 !endif\r
 !if "$(BUILD)" == "debug"\r
 __OPTIMIZEFLAG_2 = -Od\r


@@ -170,6 +175,10 @@ __DLLFLAG_p = -DWXUSINGDLL
 __DLLFLAG_p_1 = -dWXUSINGDLL\r
 !endif\r
 !if "$(MONOLITHIC)" == "0"\r
 __DLLFLAG_p_1 = -dWXUSINGDLL\r
 !endif\r
 !if "$(MONOLITHIC)" == "0"\r

+__WXLIB_RIBBON_p = \\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_ribbon.lib\r
+!endif\r
+!if "$(MONOLITHIC)" == "0"\r

 __WXLIB_XRC_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib\r
 !endif\r
 __WXLIB_XRC_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xrc.lib\r
 !endif\r


@@ -197,6 +206,9 @@ __WXLIB_BASE_p = \
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r
 __WXLIB_MONO_p = \\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
 !endif\r

+!if "$(MONOLITHIC)" == "1" && "$(USE_STC)" == "1"\r
+__LIB_SCINTILLA_IF_MONO_p = wxscintilla$(WXDEBUGFLAG).lib\r
+!endif\r

 !if "$(USE_GUI)" == "1"\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r
 __LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib\r
 !endif\r


@@ -248,14 +260,17 @@ clean:
        -if exist $(OBJS)\xrcdemo.ilf del $(OBJS)\xrcdemo.ilf\r
        -if exist $(OBJS)\xrcdemo.ils del $(OBJS)\xrcdemo.ils\r
 \r
        -if exist $(OBJS)\xrcdemo.ilf del $(OBJS)\xrcdemo.ilf\r
        -if exist $(OBJS)\xrcdemo.ils del $(OBJS)\xrcdemo.ils\r
 \r

-$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS)  $(OBJS)\xrcdemo_xrcdemo.res\r
+$(OBJS)\xrcdemo.exe: $(XRCDEMO_OBJECTS)  $(OBJS)\xrcdemo_sample.res\r

        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       c0w32.obj $(XRCDEMO_OBJECTS),$@,, $(__WXLIB_XRC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\xrcdemo_xrcdemo.res\r
+       c0w32.obj $(XRCDEMO_OBJECTS),$@,, $(__WXLIB_RIBBON_p)  $(__WXLIB_XRC_p)  $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_CORE_p)  $(__WXLIB_XML_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\xrcdemo_sample.res\r

 |\r
 \r
 data: \r
        if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r
 |\r
 \r
 data: \r
        if not exist $(OBJS)\rc mkdir $(OBJS)\rc\r

-       for %f in (appicon.ico appicon.xpm artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc\r
+       for %f in (artprov.xpm artprov.xrc basicdlg.xpm basicdlg.xrc controls.xpm controls.xrc custclas.xpm custclas.xrc derivdlg.xpm derivdlg.xrc fileopen.gif filesave.gif frame.xrc fuzzy.gif menu.xrc platform.xpm platform.xrc quotes.gif resource.xrc toolbar.xrc uncenter.xpm objref.xrc objrefdlg.xpm uncenter.xrc update.gif variable.xpm variable.xrc throbber.gif stop.xpm wxbanner.gif) do if not exist $(OBJS)\rc\%f copy .\rc\%f $(OBJS)\rc\r
+\r
+$(OBJS)\xrcdemo_sample.res: .\..\..\samples\sample.rc\r
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r

 \r
 $(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp\r
        $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) .\xrcdemo.cpp\r
 \r
 $(OBJS)\xrcdemo_xrcdemo.obj: .\xrcdemo.cpp\r
        $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) .\xrcdemo.cpp\r


@@ -269,6 +284,6 @@ $(OBJS)\xrcdemo_derivdlg.obj: .\derivdlg.cpp
 $(OBJS)\xrcdemo_custclas.obj: .\custclas.cpp\r
        $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) .\custclas.cpp\r
 \r
 $(OBJS)\xrcdemo_custclas.obj: .\custclas.cpp\r
        $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) .\custclas.cpp\r
 \r

-$(OBJS)\xrcdemo_xrcdemo.res: .\xrcdemo.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\xrcdemo.rc\r
+$(OBJS)\xrcdemo_objrefdlg.obj: .\objrefdlg.cpp\r
+       $(CXX) -q -c -P -o$@ $(XRCDEMO_CXXFLAGS) .\objrefdlg.cpp\r

 \r
 \r