wxConvGdk is not used anymore

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

diff --git a/samples/dialogs/makefile.bcc b/samples/dialogs/makefile.bcc
index 4dffb72782f20c50bce116f813e0aaa21bc94ec7..28365b641e355047dbfb40e8d74a8f562eceaadf 100644 (file)
--- a/samples/dialogs/makefile.bcc
+++ b/samples/dialogs/makefile.bcc
@@ -4,6 +4,9 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
+!ifndef BCCDIR
+BCCDIR = $(MAKEDIR)\..
+!endif
 
 # -------------------------------------------------------------------------
 # These are configurable options:
@@ -21,7 +24,7 @@ CFG =
 !endif
 # Standard preprocessor flags (common for CC and CXX) 
 !ifndef CPPFLAGS
-CPPFLAGS = 
+CPPFLAGS = -a4 -g0 -I$(BCCDIR)\include
 !endif
 # C++ compiler 
 !ifndef CXX
@@ -64,17 +67,13 @@ WXUNIV = 0
 # Do not modify the rest of this file!
 # -------------------------------------------------------------------------
 
-!ifndef BCCDIR
-BCCDIR=$(MAKEDIR)\..
-!endif
-
 !if "$(BCCDIR)" == "\.."
 !error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
 !endif
 
 ### Variables: ###
 
-OBJS = objs_bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+OBJS = bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 DIALOGS_CXXFLAGS = $(CPPFLAGS)  -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) $(CXXFLAGS)
 
 ### Conditionally set variables: ###
@@ -116,6 +115,9 @@ __UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
 __UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
 !endif
 !if "$(MONOLITHIC)" == "0"
+__WXLIB_BASE_p = wxbase25$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib
+!endif
+!if "$(MONOLITHIC)" == "0"
 __WXLIB_CORE_p = wx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core.lib
 !endif
 !if "$(MONOLITHIC)" == "1"
@@ -138,7 +140,7 @@ $(OBJS):
 all: $(OBJS)\dialogs.exe data
 
 $(OBJS)\dialogs_dialogs.obj: .\dialogs.cpp
-       $(CXX) -c -P -o$@ $(DIALOGS_CXXFLAGS) $**
+       $(CXX) -q -c -P -o$@ $(DIALOGS_CXXFLAGS) $**
 
 $(OBJS)\dialogs_dialogs.res: .\dialogs.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./../../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_1) $**
@@ -150,10 +152,12 @@ clean:
        -if exist $(OBJS)\tips.txt del $(OBJS)\tips.txt
 
 data: 
+       if not exist $(OBJS) mkdir $(OBJS)
+       for %f in (tips.txt) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\dialogs.exe: $(OBJS)\dialogs_dialogs.obj  $(OBJS)\dialogs_dialogs.res
        ilink32 -Tpe $(LDFLAGS) -L.\..\..\lib\bcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)  -aa @&&|
-       c0w32.obj  $(OBJS)\dialogs_dialogs.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib cw32.lib,, $(OBJS)\dialogs_dialogs.res
+       c0w32.obj  $(OBJS)\dialogs_dialogs.obj,$@,, $(__WXLIB_MONO_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) wxtiff$(WXDEBUGFLAG).lib wxjpeg$(WXDEBUGFLAG).lib wxpng$(WXDEBUGFLAG).lib wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXDEBUGFLAG).lib  import32.lib ole2w32.lib cw32.lib,, $(OBJS)\dialogs_dialogs.res
 |
 
 install: all