Convert back to UNIX line endings (again)

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

diff --git a/samples/keyboard/makefile.bcc b/samples/keyboard/makefile.bcc
index 3e3a1f210b6d88cdf26a447efbc7dd01d1c2d3ff..9bda6c83580b651017bed068e41ee89b0a11d2ef 100644 (file)
--- a/samples/keyboard/makefile.bcc
+++ b/samples/keyboard/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

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

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


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

+WX_RELEASE_NODOT = 25
+OBJS = \
+       bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

 KEYBOARD_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \
 KEYBOARD_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__DEBUGINFO) \
        $(__OPTIMIZEFLAG_2) -tWM -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
        $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) \

-       -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS)
+       -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(CPPFLAGS) $(CXXFLAGS)

 KEYBOARD_OBJECTS =  \
        $(OBJS)\keyboard_keyboard.obj
 KEYBOARD_OBJECTS =  \
        $(OBJS)\keyboard_keyboard.obj

-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)" == "0"
 PORTNAME = base
 !endif


@@ -52,26 +47,38 @@ WXDEBUGFLAG = d
 !if "$(DEBUG_FLAG)" == "1"
 WXDEBUGFLAG = d
 !endif
 !if "$(DEBUG_FLAG)" == "1"
 WXDEBUGFLAG = d
 !endif

-!if "$(SHARED)" == "1"
-WXDLLFLAG = dll
-!endif

 !if "$(UNICODE)" == "1"
 WXUNICODEFLAG = u
 !endif
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif
 !if "$(UNICODE)" == "1"
 WXUNICODEFLAG = u
 !endif
 !if "$(WXUNIV)" == "1"
 WXUNIVNAME = univ
 !endif

-!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
-__DEBUGINFO = -v
+!if "$(SHARED)" == "1"
+WXDLLFLAG = dll

 !endif
 !endif

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

 !endif
 !endif

-!if "$(DEBUG_INFO)" == "0"
-__DEBUGINFO = -v-
+!if "$(BUILD)" == "release"
+__OPTIMIZEFLAG_2 = -O2

 !endif
 !endif

-!if "$(DEBUG_INFO)" == "1"
-__DEBUGINFO = -v
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_6 = -tWR
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_6 = 
+!endif
+!if "$(RUNTIME_LIBS)" == "dynamic"
+__RUNTIME_LIBS_7 = i
+!endif
+!if "$(RUNTIME_LIBS)" == "static"
+__RUNTIME_LIBS_7 = 
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!endif
+!if "$(WXUNIV)" == "1"
+__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__

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


@@ -85,64 +92,59 @@ __DEBUG_DEFINE_p_1 = -d__WXDEBUG__
 !if "$(DEBUG_FLAG)" == "1"
 __DEBUG_DEFINE_p_1 = -d__WXDEBUG__
 !endif
 !if "$(DEBUG_FLAG)" == "1"
 __DEBUG_DEFINE_p_1 = -d__WXDEBUG__
 !endif

+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p = -D_UNICODE
+!endif
+!if "$(UNICODE)" == "1"
+__UNICODE_DEFINE_p_1 = -d_UNICODE
+!endif

 !if "$(SHARED)" == "1"
 __DLLFLAG_p = -DWXUSINGDLL
 !endif
 !if "$(SHARED)" == "1"
 __DLLFLAG_p_1 = -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
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_CORE_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core.lib

 !endif
 !endif

-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = \
+       wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib

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

-!if "$(BUILD)" == "debug"
-__OPTIMIZEFLAG_2 = -Od
-!endif
-!if "$(BUILD)" == "release"
-__OPTIMIZEFLAG_2 = -O2
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_6 = -tWR
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_6 = 
-!endif
-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = i
-!endif
-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 = 
-!endif
-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -D_UNICODE
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib

 !endif
 !endif

-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -d_UNICODE
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib

 !endif
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib
 !endif
 !endif
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib
 !endif

-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!if "$(SHARED)" == "0"
+LIBDIRNAME = .\..\..\lib\bcc_lib$(CFG)

 !endif
 !endif

-!if "$(MONOLITHIC)" == "0"
-__WXLIB_CORE_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
+!if "$(SHARED)" == "1"
+LIBDIRNAME = .\..\..\lib\bcc_dll$(CFG)

 !endif
 !endif

-!if "$(MONOLITHIC)" == "1"
-__WXLIB_MONO_p = \
-       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!if "$(BUILD)" == "debug" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v

 !endif
 !endif

-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!if "$(BUILD)" == "release" && "$(DEBUG_INFO)" == "default"
+__DEBUGINFO = -v-

 !endif
 !endif

-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-
+!endif
+!if "$(DEBUG_INFO)" == "1"
+__DEBUGINFO = -v

 !endif
 
 
 !endif
 
 


@@ -154,12 +156,6 @@ $(OBJS):
 
 all: $(OBJS)\keyboard.exe
 
 
 all: $(OBJS)\keyboard.exe
 

-$(OBJS)\keyboard_keyboard.obj: .\keyboard.cpp
-       $(CXX) -q -c -P -o$@ $(KEYBOARD_CXXFLAGS) $**
-
-$(OBJS)\keyboard_keyboard.res: .\keyboard.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 $**
-

 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
 clean: 
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res


@@ -172,5 +168,11 @@ clean:
 
 $(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS)  $(OBJS)\keyboard_keyboard.res
        ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
 
 $(OBJS)\keyboard.exe: $(KEYBOARD_OBJECTS)  $(OBJS)\keyboard_keyboard.res
        ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|

-       c0w32.obj $(KEYBOARD_OBJECTS),$@,, $(__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) ole2w32.lib oleacc.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\keyboard_keyboard.res
+       c0w32.obj $(KEYBOARD_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  $(__UNICOWS_LIB_p) ole2w32.lib oleacc.lib odbc32.lib  import32.lib cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\keyboard_keyboard.res

 |
 |

+
+$(OBJS)\keyboard_keyboard.obj: .\keyboard.cpp
+       $(CXX) -q -c -P -o$@ $(KEYBOARD_CXXFLAGS) $**
+
+$(OBJS)\keyboard_keyboard.res: .\keyboard.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 -dNOPCH $**