Changes that were in aclocal.m4 but not here

[wxWidgets.git] / contrib / samples / ogl / ogledit / makefile.bcc

diff --git a/contrib/samples/ogl/ogledit/makefile.bcc b/contrib/samples/ogl/ogledit/makefile.bcc
index bf10e30757c0fb7b6a701562f7787e9422f111a6..b3f988c8fe84d27afa1568c8f259bd923338da64 100644 (file)
--- a/contrib/samples/ogl/ogledit/makefile.bcc
+++ b/contrib/samples/ogl/ogledit/makefile.bcc
@@ -1,10 +1,15 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

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

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

+.autodepend
+

 !ifndef BCCDIR
 !ifndef BCCDIR

+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif

 BCCDIR = $(MAKEDIR)\..
 !endif
 
 BCCDIR = $(MAKEDIR)\..
 !endif
 


@@ -14,23 +19,17 @@ BCCDIR = $(MAKEDIR)\..
 # Do not modify the rest of this file!
 # -------------------------------------------------------------------------
 
 # Do not modify the rest of this file!
 # -------------------------------------------------------------------------
 

-!if "$(BCCDIR)" == "\.."
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-

 ### Variables: ###
 
 ### Variables: ###
 

-LIBDIRNAME = \
-       .\..\..\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)

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

-OGLEDIT_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
+SETUPHDIR = \
+       $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
+OGLEDIT_CXXFLAGS = $(__RUNTIME_LIBS_6) -I$(BCCDIR)\include $(__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$(LIBDIRNAME) -I.\..\..\..\..\src\tiff -I.\..\..\..\..\src\jpeg \
-       -I.\..\..\..\..\src\png -I.\..\..\..\..\src\zlib -I.\..\..\..\..\src\regex \
-       -I.\..\..\..\..\src\expat\lib -I. $(__DLLFLAG_p) -I.\..\..\..\include \
-       $(CXXFLAGS)
+       -I$(SETUPHDIR) -I. $(__DLLFLAG_p) -I.\..\..\..\..\samples \
+       -I.\..\..\..\include $(CPPFLAGS) $(CXXFLAGS)

 OGLEDIT_OBJECTS =  \
        $(OBJS)\ogledit_ogledit.obj \
        $(OBJS)\ogledit_doc.obj \
 OGLEDIT_OBJECTS =  \
        $(OBJS)\ogledit_ogledit.obj \
        $(OBJS)\ogledit_doc.obj \


@@ -51,26 +50,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__


@@ -84,65 +95,60 @@ __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)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib

 !endif
 !endif

-!if "$(USE_GUI)" == "1"
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+!if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!endif
+!if "$(MONOLITHIC)" == "1"
+__WXLIB_MONO_p = \
+       wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG).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 = 
+!if "$(USE_GUI)" == "1"
+__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib

 !endif
 !endif

-!if "$(RUNTIME_LIBS)" == "dynamic"
-__RUNTIME_LIBS_7 = i
+!if "$(USE_GUI)" == "1"
+__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib

 !endif
 !endif

-!if "$(RUNTIME_LIBS)" == "static"
-__RUNTIME_LIBS_7 = 
+!if "$(MSLU)" == "1"
+__UNICOWS_LIB_p = unicows.lib

 !endif
 !endif

-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+!if "$(SHARED)" == "0"
+LIBDIRNAME = .\..\..\..\..\lib\bcc_lib$(CFG)

 !endif
 !endif

-!if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
-!endif
-!if "$(MONOLITHIC)" == "0"
-__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!if "$(SHARED)" == "1"
+LIBDIRNAME = .\..\..\..\..\lib\bcc_dll$(CFG)

 !endif
 !endif

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

 !endif
 !endif

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

 !endif
 !endif

-!if "$(WXUNIV)" == "1"
-__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+!if "$(DEBUG_INFO)" == "0"
+__DEBUGINFO = -v-

 !endif
 !endif

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

 !endif
 
 !endif
 

-MAKEARGS = -DBUILD=$(BUILD) -DCFG=$(CFG) -DCPPFLAGS=$(CPPFLAGS) -DCXX=$(CXX) -DCXXFLAGS=$(CXXFLAGS) -DDEBUG_FLAG=$(DEBUG_FLAG) -DDEBUG_INFO=$(DEBUG_INFO) -DLDFLAGS=$(LDFLAGS) -DMONOLITHIC=$(MONOLITHIC) -DOFFICIAL_BUILD=$(OFFICIAL_BUILD) -DRUNTIME_LIBS=$(RUNTIME_LIBS) -DSHARED=$(SHARED) -DUNICODE=$(UNICODE) -DUSE_GUI=$(USE_GUI) -DWXUNIV=$(WXUNIV)
-

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


@@ -152,27 +158,32 @@ $(OBJS):
 
 all: $(OBJS)\ogledit.exe
 
 
 all: $(OBJS)\ogledit.exe
 

-$(OBJS)\ogledit_doc.obj: .\doc.cpp
-       $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
+clean: 
+       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
+       -if exist $(OBJS)\*.res del $(OBJS)\*.res
+       -if exist $(OBJS)\ogledit.exe del $(OBJS)\ogledit.exe
+       -if exist $(OBJS)\ogledit.tds del $(OBJS)\ogledit.tds
+       -if exist $(OBJS)\ogledit.ilc del $(OBJS)\ogledit.ilc
+       -if exist $(OBJS)\ogledit.ild del $(OBJS)\ogledit.ild
+       -if exist $(OBJS)\ogledit.ilf del $(OBJS)\ogledit.ilf
+       -if exist $(OBJS)\ogledit.ils del $(OBJS)\ogledit.ils
+
+$(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS)  $(OBJS)\ogledit_ogledit.res
+       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
+       c0w32.obj $(OGLEDIT_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib  wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.lib  $(__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)\ogledit_ogledit.res
+|

 
 $(OBJS)\ogledit_ogledit.obj: .\ogledit.cpp
        $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
 
 
 $(OBJS)\ogledit_ogledit.obj: .\ogledit.cpp
        $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
 

-$(OBJS)\ogledit_ogledit.res: .\ogledit.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$(LIBDIRNAME) -i.\..\..\..\..\src\tiff -i.\..\..\..\..\src\jpeg -i.\..\..\..\..\src\png -i.\..\..\..\..\src\zlib  -i.\..\..\..\..\src\regex -i.\..\..\..\..\src\expat\lib -i. $(__DLLFLAG_p_1) -i.\..\..\..\include $**
-
-$(OBJS)\ogledit_palette.obj: .\palette.cpp
+$(OBJS)\ogledit_doc.obj: .\doc.cpp

        $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
 
 $(OBJS)\ogledit_view.obj: .\view.cpp
        $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
 
        $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
 
 $(OBJS)\ogledit_view.obj: .\view.cpp
        $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**
 

-clean: 
-       -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
-       -if exist $(OBJS)\*.res del $(OBJS)\*.res
-       -if exist $(OBJS)\ogledit.exe del $(OBJS)\ogledit.exe
+$(OBJS)\ogledit_palette.obj: .\palette.cpp
+       $(CXX) -q -c -P -o$@ $(OGLEDIT_CXXFLAGS) $**

 
 

-$(OBJS)\ogledit.exe: $(OGLEDIT_OBJECTS)  $(OBJS)\ogledit_ogledit.res
-       ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa  @&&|
-       c0w32.obj $(OGLEDIT_OBJECTS),$@,, wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_ogl.lib wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_deprecated.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  import32.lib ole2w32.lib  cw32mt$(__RUNTIME_LIBS_7).lib,, $(OBJS)\ogledit_ogledit.res
-|
+$(OBJS)\ogledit_ogledit.res: .\ogledit.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 $**