Make TOOLKIT variable constant in MSW makefiles.

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

diff --git a/samples/notebook/makefile.bcc b/samples/notebook/makefile.bcc
index 4ea03a5a4c55d597e6e6fdc549a184ec69792d9e..d3454ef7e0d772e07c9b954846b2ca3c668b0f99 100644 (file)
--- a/samples/notebook/makefile.bcc
+++ b/samples/notebook/makefile.bcc
@@ -24,15 +24,16 @@ BCCDIR = $(MAKEDIR)\..
 WX_RELEASE_NODOT = 29\r
 COMPILER_PREFIX = bcc\r
 OBJS = \\r
 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
 NOTEBOOK_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 NOTEBOOK_CXXFLAGS = $(__RUNTIME_LIBS_7) -I$(BCCDIR)\include $(__DEBUGINFO) \\r

-       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \\r
-       $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \\r
-       $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \\r
+       $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_6) -D__WX$(TOOLKIT)__ \
+       $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) \
+       $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) \
+       $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \

        $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
        -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
 NOTEBOOK_OBJECTS =  \\r
        $(____CAIRO_INCLUDEDIR_FILENAMES_p) -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
        -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
 NOTEBOOK_OBJECTS =  \\r


@@ -40,11 +41,23 @@ NOTEBOOK_OBJECTS =  \
 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r

+!if "$(TOOLKIT)" == "GTK"
+WIN32_TOOLKIT_LOWERCASE = gtk
+!endif
+!if "$(TOOLKIT)" == "MSW"
+WIN32_TOOLKIT_LOWERCASE = msw
+!endif

 !if "$(USE_GUI)" == "0"\r
 PORTNAME = base\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r
 !if "$(USE_GUI)" == "0"\r
 PORTNAME = base\r
 !endif\r
 !if "$(USE_GUI)" == "1"\r

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

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


@@ -68,8 +81,13 @@ 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
 !endif\r

+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
+       gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
+       glib-2.0.lib
+!endif

 !if "$(BUILD)" == "debug"\r
 __OPTIMIZEFLAG_2 = -Od\r
 !endif\r
 !if "$(BUILD)" == "debug"\r
 __OPTIMIZEFLAG_2 = -Od\r
 !endif\r


@@ -171,12 +189,24 @@ __WXLIB_AUI_p = \
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib\r
 !endif\r
 !if "$(MONOLITHIC)" == "0"\r
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_aui.lib\r
 !endif\r
 !if "$(MONOLITHIC)" == "0"\r

+__WXLIB_HTML_p = \\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_html.lib\r
+!endif\r
+!if "$(MONOLITHIC)" == "0"\r
+__WXLIB_ADV_p = \\r
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib\r
+!endif\r
+!if "$(MONOLITHIC)" == "0"\r

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

+__WXLIB_XML_p = \\r
+       wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif\r
+!if "$(MONOLITHIC)" == "0"\r

 __WXLIB_BASE_p = \\r
 __WXLIB_BASE_p = \\r

-       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib\r
+       wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

 !endif\r
 !if "$(MONOLITHIC)" == "1"\r
 __WXLIB_MONO_p = \\r
 !endif\r
 !if "$(MONOLITHIC)" == "1"\r
 __WXLIB_MONO_p = \\r


@@ -235,11 +265,11 @@ clean:
 \r
 $(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS)  $(OBJS)\notebook_sample.res\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r
 \r
 $(OBJS)\notebook.exe: $(NOTEBOOK_OBJECTS)  $(OBJS)\notebook_sample.res\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|\r

-       c0w32.obj $(NOTEBOOK_OBJECTS),$@,, $(__WXLIB_AUI_p)  $(__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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\notebook_sample.res\r
+       c0w32.obj $(NOTEBOOK_OBJECTS),$@,, $(__WXLIB_AUI_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) $(LIB_GTK)  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)\notebook_sample.res

 |\r
 \r
 $(OBJS)\notebook_sample.res: .\..\..\samples\sample.rc\r
 |\r
 \r
 $(OBJS)\notebook_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
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WX$(TOOLKIT)__ $(__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
 $(OBJS)\notebook_notebook.obj: .\notebook.cpp\r
        $(CXX) -q -c -P -o$@ $(NOTEBOOK_CXXFLAGS) .\notebook.cpp\r
 \r
 $(OBJS)\notebook_notebook.obj: .\notebook.cpp\r
        $(CXX) -q -c -P -o$@ $(NOTEBOOK_CXXFLAGS) .\notebook.cpp\r