Removed redundant DoEnable

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

diff --git a/samples/dll/makefile.bcc b/samples/dll/makefile.bcc
index df2f60545cb0fc403ae8a4ef7879223d1b79bdf6..88085b1bd9b43ab6ed049a2b035ffa7c7ab18a7b 100644 (file)
--- a/samples/dll/makefile.bcc
+++ b/samples/dll/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
@@ -29,22 +29,27 @@ LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = \\r
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)\r
 MY_DLL_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \\r
-       $(____CAIRO_INCLUDEDIR_FILENAMES) $(__DLLFLAG_p) -I. $(CPPFLAGS) $(CXXFLAGS)\r
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG_1) -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
+       $(____CAIRO_INCLUDEDIR_FILENAMES) $(__DLLFLAG_p) -DMY_DLL_BUILDING -I. \\r
+       $(CPPFLAGS) $(CXXFLAGS)\r
 MY_DLL_OBJECTS =  \\r
        $(OBJS)\my_dll_my_dll.obj\r
 WX_EXE_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
-       $(__OPTIMIZEFLAG) $(__THREADSFLAG_0) -D__WXMSW__ $(__WXUNIV_DEFINE_p) \\r
-       $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \\r
-       $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \\r
-       $(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \\r
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG_1) -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
        $(____CAIRO_INCLUDEDIR_FILENAMES) -I. $(__DLLFLAG_p) -I.\..\..\samples \\r
        -DNOPCH $(CPPFLAGS) $(CXXFLAGS)\r
 WX_EXE_OBJECTS =  \\r
-       $(OBJS)\wx_exe_dll_user_wx.obj\r
+       $(OBJS)\wx_exe_wx_exe.obj\r
+SDK_EXE_CXXFLAGS = $(__RUNTIME_LIBS) -I$(BCCDIR)\include $(__DEBUGINFO) \\r
+       $(__OPTIMIZEFLAG) $(__THREADSFLAG_1) $(CPPFLAGS) $(CXXFLAGS)\r
+SDK_EXE_OBJECTS =  \\r
+       $(OBJS)\sdk_exe_sdk_exe.obj\r
 \r
 ### Conditionally set variables: ###\r
 \r
@@ -76,7 +81,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 "$(SHARED)" == "0"\r
 __wx_exe___depname = $(OBJS)\wx_exe.exe\r
@@ -87,6 +92,9 @@ __WXUNIV_DEFINE_p_3 = -d__WXUNIVERSAL__
 !if "$(DEBUG_FLAG)" == "0"\r
 __DEBUG_DEFINE_p_3 = -dwxDEBUG_LEVEL=0\r
 !endif\r
+!if "$(BUILD)" == "release"\r
+__NDEBUG_DEFINE_p_3 = -dNDEBUG\r
+!endif\r
 !if "$(USE_EXCEPTIONS)" == "0"\r
 __EXCEPTIONS_DEFINE_p_3 = -dwxNO_EXCEPTIONS\r
 !endif\r
@@ -105,51 +113,21 @@ __UNICODE_DEFINE_p_3 = -d_UNICODE
 !if "$(MSLU)" == "1"\r
 __MSLU_DEFINE_p_3 = -dwxUSE_UNICODE_MSLU=1\r
 !endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p_3 = -dwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
 !if "$(USE_CAIRO)" == "1"\r
 ____CAIRO_INCLUDEDIR_FILENAMES_3_p = -i$(CAIRO_ROOT)\include\cairo\r
 !endif\r
 !if "$(SHARED)" == "1"\r
 __DLLFLAG_p_3 = -dWXUSINGDLL\r
 !endif\r
-!if "$(BUILD)" == "debug"\r
-__OPTIMIZEFLAG = -Od\r
-!endif\r
-!if "$(BUILD)" == "release"\r
-__OPTIMIZEFLAG = -O2\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG = mt\r
-!endif\r
-!if "$(USE_THREADS)" == "0"\r
-__THREADSFLAG_0 = \r
-!endif\r
-!if "$(USE_THREADS)" == "1"\r
-__THREADSFLAG_0 = -tWM\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS = -tWR\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS = \r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "dynamic"\r
-__RUNTIME_LIBS_0 = i\r
-!endif\r
-!if "$(RUNTIME_LIBS)" == "static"\r
-__RUNTIME_LIBS_0 = \r
-!endif\r
 !if "$(WXUNIV)" == "1"\r
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__\r
 !endif\r
 !if "$(DEBUG_FLAG)" == "0"\r
 __DEBUG_DEFINE_p = -DwxDEBUG_LEVEL=0\r
 !endif\r
+!if "$(BUILD)" == "release"\r
+__NDEBUG_DEFINE_p = -DNDEBUG\r
+!endif\r
 !if "$(USE_EXCEPTIONS)" == "0"\r
 __EXCEPTIONS_DEFINE_p = -DwxNO_EXCEPTIONS\r
 !endif\r
@@ -168,9 +146,6 @@ __UNICODE_DEFINE_p = -D_UNICODE
 !if "$(MSLU)" == "1"\r
 __MSLU_DEFINE_p = -DwxUSE_UNICODE_MSLU=1\r
 !endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1\r
-!endif\r
 !if "$(USE_CAIRO)" == "1"\r
 ____CAIRO_INCLUDEDIR_FILENAMES = -I$(CAIRO_ROOT)\include\cairo\r
 !endif\r
@@ -201,15 +176,42 @@ __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !if "$(MSLU)" == "1"\r
 __UNICOWS_LIB_p = unicows.lib\r
 !endif\r
-!if "$(USE_GDIPLUS)" == "1"\r
-__GDIPLUS_LIB_p = gdiplus.lib\r
-!endif\r
 !if "$(USE_CAIRO)" == "1"\r
 __CAIRO_LIB_p = cairo.lib\r
 !endif\r
 !if "$(USE_CAIRO)" == "1"\r
 ____CAIRO_LIBDIR_FILENAMES = -L$(CAIRO_ROOT)\lib\r
 !endif\r
+!if "$(BUILD)" == "debug"\r
+__OPTIMIZEFLAG = -Od\r
+!endif\r
+!if "$(BUILD)" == "release"\r
+__OPTIMIZEFLAG = -O2\r
+!endif\r
+!if "$(USE_THREADS)" == "0"\r
+__THREADSFLAG = \r
+!endif\r
+!if "$(USE_THREADS)" == "1"\r
+__THREADSFLAG = mt\r
+!endif\r
+!if "$(USE_THREADS)" == "0"\r
+__THREADSFLAG_1 = \r
+!endif\r
+!if "$(USE_THREADS)" == "1"\r
+__THREADSFLAG_1 = -tWM\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "dynamic"\r
+__RUNTIME_LIBS = -tWR\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "static"\r
+__RUNTIME_LIBS = \r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "dynamic"\r
+__RUNTIME_LIBS_1 = i\r
+!endif\r
+!if "$(RUNTIME_LIBS)" == "static"\r
+__RUNTIME_LIBS_1 = \r
+!endif\r
 !if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"\r
 __DEBUGINFO = -v\r
 !endif\r
@@ -230,7 +232,7 @@ $(OBJS):
 \r
 ### Targets: ###\r
 \r
-all: $(OBJS)\my_dll.dll $(__wx_exe___depname)\r
+all: $(OBJS)\my_dll.dll $(__wx_exe___depname) $(OBJS)\sdk_exe.exe\r
 \r
 clean: \r
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj\r
@@ -249,26 +251,40 @@ clean:
        -if exist $(OBJS)\wx_exe.ild del $(OBJS)\wx_exe.ild\r
        -if exist $(OBJS)\wx_exe.ilf del $(OBJS)\wx_exe.ilf\r
        -if exist $(OBJS)\wx_exe.ils del $(OBJS)\wx_exe.ils\r
+       -if exist $(OBJS)\sdk_exe.exe del $(OBJS)\sdk_exe.exe\r
+       -if exist $(OBJS)\sdk_exe.tds del $(OBJS)\sdk_exe.tds\r
+       -if exist $(OBJS)\sdk_exe.ilc del $(OBJS)\sdk_exe.ilc\r
+       -if exist $(OBJS)\sdk_exe.ild del $(OBJS)\sdk_exe.ild\r
+       -if exist $(OBJS)\sdk_exe.ilf del $(OBJS)\sdk_exe.ilf\r
+       -if exist $(OBJS)\sdk_exe.ils del $(OBJS)\sdk_exe.ils\r
 \r
 $(OBJS)\my_dll.dll: $(MY_DLL_OBJECTS)\r
        ilink32 -Tpd -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|\r
-       c0d32.obj $(MY_DLL_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_0).lib,,\r
+       c0d32.obj $(MY_DLL_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) $(__CAIRO_LIB_p) ole2w32.lib oleacc.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,,\r
 |\r
        implib -f $(OBJS)\my_dll $@\r
 \r
 !if "$(SHARED)" == "0"\r
 $(OBJS)\wx_exe.exe: $(WX_EXE_OBJECTS)  $(OBJS)\wx_exe_sample.res $(OBJS)\my_dll.dll\r
        ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa $(____CAIRO_LIBDIR_FILENAMES) $(LDFLAGS) @&&|\r
-       c0w32.obj $(WX_EXE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(OBJS)\my_dll.lib $(__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)$(__RUNTIME_LIBS_0).lib,, $(OBJS)\wx_exe_sample.res\r
+       c0w32.obj $(WX_EXE_OBJECTS),$@,, $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(OBJS)\my_dll.lib $(__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)$(__RUNTIME_LIBS_1).lib,, $(OBJS)\wx_exe_sample.res\r
 |\r
 !endif\r
 \r
+$(OBJS)\sdk_exe.exe: $(SDK_EXE_OBJECTS) $(OBJS)\my_dll.dll\r
+       ilink32 -Tpe -q  -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -aa $(LDFLAGS) @&&|\r
+       c0w32.obj $(SDK_EXE_OBJECTS),$@,, $(OBJS)\my_dll.lib user32.lib import32.lib cw32$(__THREADSFLAG)$(__RUNTIME_LIBS_1).lib,,\r
+|\r
+\r
 $(OBJS)\my_dll_my_dll.obj: .\my_dll.cpp\r
        $(CXX) -q -c -P -o$@ $(MY_DLL_CXXFLAGS) .\my_dll.cpp\r
 \r
 $(OBJS)\wx_exe_sample.res: .\..\..\samples\sample.rc\r
-       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) $(__GFXCTX_DEFINE_p_3) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_3_p) -i. $(__DLLFLAG_p_3) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include    -d__WXMSW__ $(__WXUNIV_DEFINE_p_3) $(__DEBUG_DEFINE_p_3) $(__NDEBUG_DEFINE_p_3) $(__EXCEPTIONS_DEFINE_p_3) $(__RTTI_DEFINE_p_3) $(__THREAD_DEFINE_p_3) $(__UNICODE_DEFINE_p_3) $(__MSLU_DEFINE_p_3) -i$(SETUPHDIR) -i.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_3_p) -i. $(__DLLFLAG_p_3) -i.\..\..\samples -dNOPCH .\..\..\samples\sample.rc\r
+\r
+$(OBJS)\wx_exe_wx_exe.obj: .\wx_exe.cpp\r
+       $(CXX) -q -c -P -o$@ $(WX_EXE_CXXFLAGS) .\wx_exe.cpp\r
 \r
-$(OBJS)\wx_exe_dll_user_wx.obj: .\dll_user_wx.cpp\r
-       $(CXX) -q -c -P -o$@ $(WX_EXE_CXXFLAGS) .\dll_user_wx.cpp\r
+$(OBJS)\sdk_exe_sdk_exe.obj: .\sdk_exe.cpp\r
+       $(CXX) -q -c -P -o$@ $(SDK_EXE_CXXFLAGS) .\sdk_exe.cpp\r
 \r