X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f82b7036e8e6068411853610dd8ce01265b99719..ce7fe42e848cc0c9058dae906c3a7bded50681e6:/samples/dialogs/makefile.bcc

diff --git a/samples/dialogs/makefile.bcc b/samples/dialogs/makefile.bcc
index 58ba171127..abbb25b050 100644
--- a/samples/dialogs/makefile.bcc
+++ b/samples/dialogs/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.8 (http://www.bakefile.org)
+#     Bakefile 0.2.9 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -24,15 +24,16 @@ BCCDIR = $(MAKEDIR)\..
 WX_RELEASE_NODOT = 29
 COMPILER_PREFIX = bcc
 OBJS = \
-	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+	$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+	.\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \
 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 DIALOGS_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) $(__MSLU_DEFINE_p) \
-	$(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
+	$(__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 \
 	-DNOPCH $(CPPFLAGS) $(CXXFLAGS)
 DIALOGS_OBJECTS =  \
@@ -41,11 +42,23 @@ DIALOGS_OBJECTS =  \
 
 ### Conditionally set variables: ###
 
+!if "$(TOOLKIT)" == "GTK"
+WIN32_TOOLKIT_LOWERCASE = gtk
+!endif
+!if "$(TOOLKIT)" == "MSW"
+WIN32_TOOLKIT_LOWERCASE = msw
+!endif
 !if "$(USE_GUI)" == "0"
 PORTNAME = base
 !endif
 !if "$(USE_GUI)" == "1"
-PORTNAME = msw
+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
 !if "$(BUILD)" == "debug"
 WXDEBUGFLAG = d
@@ -69,8 +82,13 @@ LIBTYPE_SUFFIX = dll
 EXTRALIBS_FOR_BASE = 
 !endif
 !if "$(MONOLITHIC)" == "1"
-EXTRALIBS_FOR_BASE =  
+EXTRALIBS_FOR_BASE =   
 !endif
+!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"
 __OPTIMIZEFLAG_2 = -Od
 !endif
@@ -113,6 +131,12 @@ __DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0
 !if "$(DEBUG_FLAG)" == "0"
 __DEBUG_DEFINE_p_1 = -dwxDEBUG_LEVEL=0
 !endif
+!if "$(BUILD)" == "release"
+__NDEBUG_DEFINE_p = -DNDEBUG
+!endif
+!if "$(BUILD)" == "release"
+__NDEBUG_DEFINE_p_1 = -dNDEBUG
+!endif
 !if "$(USE_EXCEPTIONS)" == "0"
 __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS
 !endif
@@ -149,12 +173,6 @@ __MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1
 !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 "$(USE_CAIRO)" == "1"
 ____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
 !endif
@@ -167,13 +185,28 @@ __DLLFLAG_p = -DWXUSINGDLL
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_1 = -dWXUSINGDLL
 !endif
-!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
+!if "$(SHARED)" == "0" && "$(TOOLKIT)" == "MAC" && "$(WXUNIV)" == "0"
+____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS =  \
+	$(OBJS)\dialogs_colrdlgg.obj \
+	$(OBJS)\dialogs_dirdlgg.obj \
+	$(OBJS)\dialogs_filedlgg.obj
+!endif
+!if "$(SHARED)" == "0" && "$(TOOLKIT)" == "MSW" && "$(WXUNIV)" == "0"
 ____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS =  \
 	$(OBJS)\dialogs_colrdlgg.obj \
 	$(OBJS)\dialogs_dirdlgg.obj \
 	$(OBJS)\dialogs_filedlgg.obj \
 	$(OBJS)\dialogs_fontdlgg.obj
 !endif
+!if "$(SHARED)" == "0" && "$(TOOLKIT)" == "PM" && "$(WXUNIV)" == "0"
+____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS =  \
+	$(OBJS)\dialogs_fontdlgg.obj \
+	$(OBJS)\dialogs_filedlgg.obj
+!endif
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS =  \
+	$(OBJS)\dialogs_filedlgg.obj
+!endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_ADV_p = \
 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
@@ -184,7 +217,7 @@ __WXLIB_CORE_p = \
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = \
-	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+	wxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
 !if "$(MONOLITHIC)" == "1"
 __WXLIB_MONO_p = \
@@ -202,9 +235,6 @@ __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 "$(USE_CAIRO)" == "1"
 __CAIRO_LIB_p = cairo.lib
 !endif
@@ -244,30 +274,48 @@ clean:
 	-if exist $(OBJS)\dialogs.ilf del $(OBJS)\dialogs.ilf
 	-if exist $(OBJS)\dialogs.ils del $(OBJS)\dialogs.ils
 
-$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS)  $(OBJS)\dialogs_dialogs.res
+$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS)  $(OBJS)\dialogs_sample.res
 	ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) @&&|
-	c0w32.obj $(DIALOGS_OBJECTS),$@,, $(__WXLIB_ADV_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) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG_5)$(__RUNTIME_LIBS_8).lib,, $(OBJS)\dialogs_dialogs.res
+	c0w32.obj $(DIALOGS_OBJECTS),$@,, $(__WXLIB_ADV_p)  $(__WXLIB_CORE_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)\dialogs_sample.res
 |
 
 data: 
 	if not exist $(OBJS) mkdir $(OBJS)
 	for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
+$(OBJS)\dialogs_sample.res: .\..\..\samples\sample.rc
+	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
+
 $(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp
 	$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\dialogs.cpp
 
+!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
 $(OBJS)\dialogs_colrdlgg.obj: .\..\..\src\generic\colrdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\colrdlgg.cpp
+!endif
 
+!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
 $(OBJS)\dialogs_dirdlgg.obj: .\..\..\src\generic\dirdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\dirdlgg.cpp
+!endif
 
+!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
 $(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp
 	$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\filedlgg.cpp
+!endif
 
+!if "$(TOOLKIT)" == "GTK" && "$(TOOLKIT_VERSION)" == "2"
+$(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp
+	$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\filedlgg.cpp
+!endif
+
+!if "$(SHARED)" == "0" && "$(TOOLKIT)" == "PM" && "$(WXUNIV)" == "0"
+$(OBJS)\dialogs_filedlgg.obj: .\..\..\src\generic\filedlgg.cpp
+	$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\filedlgg.cpp
+!endif
+
+!if "$(SHARED)" == "0" && "$(WXUNIV)" == "0"
 $(OBJS)\dialogs_fontdlgg.obj: .\..\..\src\generic\fontdlgg.cpp
 	$(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) .\..\..\src\generic\fontdlgg.cpp
-
-$(OBJS)\dialogs_dialogs.res: .\dialogs.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 $(____CAIRO_INCLUDEDIR_FILENAMES_1_p) -i. $(__DLLFLAG_p_1) -i.\..\..\samples -dNOPCH .\dialogs.rc
+!endif