regenerated makefiles after fixing files.bkl

[wxWidgets.git] / contrib / samples / animate / makefile.bcc

diff --git a/contrib/samples/animate/makefile.bcc b/contrib/samples/animate/makefile.bcc
index 64f4e40776127675cea3d7327567c13c14e72db7..c2532d53017327995764b2ba2e1898d21185e713 100644 (file)
--- a/contrib/samples/animate/makefile.bcc
+++ b/contrib/samples/animate/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1.20030719 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -8,7 +8,7 @@
 BCCDIR = $(MAKEDIR)\..
 !endif
 
 BCCDIR = $(MAKEDIR)\..
 !endif
 

-!include ../../../build/config.bcc
+!include ../../../build/msw/config.bcc

 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!


@@ -20,25 +20,36 @@ BCCDIR = $(MAKEDIR)\..
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-ANITEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGFLAG) \
+ANITEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \

        $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \
        $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\..\include \

-       -I.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG) \
-       -I.\..\..\..\src\tiff -I.\..\..\..\src\jpeg -I.\..\..\..\src\png \
-       -I.\..\..\..\src\zlib -I.\..\..\..\src\regex -I. $(__DLLFLAG_p) \
-       -I.\..\..\include $(CXXFLAGS)
+       -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\samples -I.\..\..\include \
+       $(CXXFLAGS)
+ANITEST_OBJECTS =  \
+       $(OBJS)\anitest_anitest.obj

 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
        bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 

+!if "$(SHARED)" == "0"
+LIBDIRNAME = .\..\..\..\lib\bcc_lib$(CFG)
+!endif
+!if "$(SHARED)" == "1"
+LIBDIRNAME = .\..\..\..\lib\bcc_dll$(CFG)
+!endif

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

-!if "$(BUILD)" == "debug"
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+WXDEBUGFLAG = d
+!endif
+!if "$(DEBUG_FLAG)" == "1"

 WXDEBUGFLAG = d
 !endif
 !if "$(SHARED)" == "1"
 WXDEBUGFLAG = d
 !endif
 !if "$(SHARED)" == "1"


@@ -50,18 +61,45 @@ WXUNICODEFLAG = u
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif

-!if "$(BUILD)" == "debug"
-__DEBUGFLAG = -v
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v

 !endif
 !endif

-!if "$(BUILD)" == "release"
-__DEBUGFLAG = -v-
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-

 !endif
 !endif

-!if "$(BUILD)" == "debug"
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"

 __DEBUG_DEFINE_p = -D__WXDEBUG__
 !endif
 __DEBUG_DEFINE_p = -D__WXDEBUG__
 !endif

+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p = -D__WXDEBUG__
+!endif
+!if "$(BUILD)" == "debug" && "$(DEBUG_FLAG)" == "default"
+__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
+!endif
+!if "$(DEBUG_FLAG)" == "1"
+__DEBUG_DEFINE_p_1 = -d__WXDEBUG__
+!endif

 !if "$(SHARED)" == "1"
 __DLLFLAG_p = -DWXUSINGDLL
 !endif
 !if "$(SHARED)" == "1"
 __DLLFLAG_p = -DWXUSINGDLL
 !endif

+!if "$(SHARED)" == "1"
+__DLLFLAG_p_1 = -dWXUSINGDLL
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!endif
+!if "$(USE_GUI)" == "1"
+__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
+!endif

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


@@ -83,6 +121,12 @@ __RUNTIME_LIBS_7 =
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif
 !if "$(UNICODE)" == "1"
 __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 !endif

+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
+!endif
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib
+!endif

 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif
 !if "$(MONOLITHIC)" == "0"
 __WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
 !endif


@@ -97,6 +141,9 @@ __WXLIB_MONO_p = \
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 !endif
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 !endif

+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!endif

 
 
 all: $(OBJS)
 
 
 all: $(OBJS)


@@ -110,9 +157,12 @@ all: $(OBJS)\anitest.exe data
 $(OBJS)\anitest_anitest.obj: .\anitest.cpp
        $(CXX) -q -c -P -o$@ $(ANITEST_CXXFLAGS) $**
 
 $(OBJS)\anitest_anitest.obj: .\anitest.cpp
        $(CXX) -q -c -P -o$@ $(ANITEST_CXXFLAGS) $**
 

-$(OBJS)\anitest.exe: $(OBJS)\anitest_anitest.obj
-       ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGFLAG)  -L.\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  -aa @&&|
-       c0w32.obj  $(OBJS)\anitest_anitest.obj,$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,,
+$(OBJS)\anitest_anitest.res: .\anitest.rc
+       brcc32 -32 -r -fo$@ -i$(BCCDIR)\include -d__WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) -i.\..\..\..\include -i$(SETUPHDIR) -i. $(__DLLFLAG_p_1) -i.\..\..\..\samples -i.\..\..\include $**
+
+$(OBJS)\anitest.exe: $(ANITEST_OBJECTS)  $(OBJS)\anitest_anitest.res
+       ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
+       c0w32.obj $(ANITEST_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_animate.lib $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib  $(__UNICOWS_LIB_p) import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\anitest_anitest.res

 |
 
 clean: 
 |
 
 clean: