Applied patch [ 853031 ] Japanese po file

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

diff --git a/samples/db/makefile.bcc b/samples/db/makefile.bcc
index 933d0f0119df5e96c952a224c2ecfb59760bd84c..4a44886fb4c029c5b81a5b4fdfca24dfae5c7092 100644 (file)
--- a/samples/db/makefile.bcc
+++ b/samples/db/makefile.bcc
@@ -4,7 +4,12 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
+.autodepend
+
 !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
 
@@ -14,16 +19,12 @@ BCCDIR = $(MAKEDIR)\..
 # 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: ###
 
-DBTEST_CXXFLAGS = $(CPPFLAGS) $(__RUNTIME_LIBS_6) $(__DEBUGINFO) \
+DBTEST_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 $(CXXFLAGS)
+       -I. $(__DLLFLAG_p) -I.\..\..\samples $(CPPFLAGS) $(CXXFLAGS)
 DBTEST_OBJECTS =  \
        $(OBJS)\dbtest_dbtest.obj \
        $(OBJS)\dbtest_listdb.obj
@@ -119,10 +120,10 @@ __RUNTIME_LIBS_7 = i
 __RUNTIME_LIBS_7 = 
 !endif
 !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE
 !endif
 !if "$(UNICODE)" == "1"
-__UNICODE_DEFINE_p_1 = -dwxUSE_UNICODE=1
+__UNICODE_DEFINE_p_1 = -d_UNICODE
 !endif
 !if "$(MSLU)" == "1"
 __UNICOWS_LIB_p = unicows.lib
@@ -147,6 +148,9 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 !if "$(WXUNIV)" == "1"
 __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
 !endif
+!if "$(USE_ODBC)" == "1"
+__dbtest___depname = $(OBJS)\dbtest.exe
+!endif
 
 
 all: $(OBJS)
@@ -155,13 +159,13 @@ $(OBJS):
 
 ### Targets: ###
 
-all: $(OBJS)\dbtest.exe
+all: $(__dbtest___depname)
 
 $(OBJS)\dbtest_dbtest.obj: .\dbtest.cpp
        $(CXX) -q -c -P -o$@ $(DBTEST_CXXFLAGS) $**
 
 $(OBJS)\dbtest_dbtest.res: .\dbtest.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 $**
+       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 $**
 
 $(OBJS)\dbtest_listdb.obj: .\listdb.cpp
        $(CXX) -q -c -P -o$@ $(DBTEST_CXXFLAGS) $**
@@ -170,8 +174,15 @@ clean:
        -if exist $(OBJS)\*.obj del $(OBJS)\*.obj
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\dbtest.exe del $(OBJS)\dbtest.exe
+       -if exist $(OBJS)\dbtest.tds del $(OBJS)\dbtest.tds
+       -if exist $(OBJS)\dbtest.ilc del $(OBJS)\dbtest.ilc
+       -if exist $(OBJS)\dbtest.ild del $(OBJS)\dbtest.ild
+       -if exist $(OBJS)\dbtest.ilf del $(OBJS)\dbtest.ilf
+       -if exist $(OBJS)\dbtest.ils del $(OBJS)\dbtest.ils
 
+!if "$(USE_ODBC)" == "1"
 $(OBJS)\dbtest.exe: $(DBTEST_OBJECTS)  $(OBJS)\dbtest_dbtest.res
-       ilink32 -Tpe -q $(LDFLAGS) $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
-       c0w32.obj $(DBTEST_OBJECTS),$@,, $(__WXLIB_ODBC_p) $(__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)\dbtest_dbtest.res
+       ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib -L$(BCCDIR)\lib\psdk $(__DEBUGINFO)  -L$(LIBDIRNAME) -aa @&&|
+       c0w32.obj $(DBTEST_OBJECTS),$@,, $(__WXLIB_ODBC_p)  $(__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)\dbtest_dbtest.res
 |
+!endif