Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compile db sample conditionally only if odbc support was built

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-09-28 18:23:23 +00:00
parent ac95e67140
commit 2e9fdc04f2
6 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
samples/db/Makefile.in
View File

@@ -96,6 +96,7 @@ COND_MONOLITHIC_0___WXLIB_ODBC_p = \
@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__ @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
@COND_USE_ODBC_1@__dbtest___depname = dbtest$(EXEEXT)
@COND_PLATFORM_MAC_1@__dbtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1) @COND_PLATFORM_MAC_1@__dbtest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@COND_PLATFORM_MAC_1@__dbtest___mac_setfilecmd = \ @COND_PLATFORM_MAC_1@__dbtest___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C dbtest$(EXEEXT) @COND_PLATFORM_MAC_1@ $(SETFILE) -a C dbtest$(EXEEXT)
@@ -107,7 +108,7 @@ COND_PLATFORM_OS2_1___dbtest___os2_emxbindcmd = $(NM) dbtest$(EXEEXT) | if grep
### Targets: ### ### Targets: ###
all: dbtest$(EXEEXT) $(__dbtest_bundle___depname) all: $(__dbtest___depname) $(__dbtest_bundle___depname)
clean: clean:
rm -rf ./.deps ./.pch rm -rf ./.deps ./.pch
@@ -115,14 +116,14 @@ clean:
rm -f dbtest$(EXEEXT) rm -f dbtest$(EXEEXT)
rm -rf dbtest.app rm -rf dbtest.app
dbtest$(EXEEXT): $(DBTEST_OBJECTS) $(__dbtest___win32rc) @COND_USE_ODBC_1@dbtest$(EXEEXT): $(DBTEST_OBJECTS) $(__dbtest___win32rc)
$(CXX) -o $@ $(DBTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI) @COND_USE_ODBC_1@ $(CXX) -o $@ $(DBTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
$(__dbtest___mac_rezcmd) @COND_USE_ODBC_1@ $(__dbtest___mac_rezcmd)
$(__dbtest___mac_setfilecmd) @COND_USE_ODBC_1@ $(__dbtest___mac_setfilecmd)
$(__dbtest___os2_emxbindcmd) @COND_USE_ODBC_1@ $(__dbtest___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK) @COND_USE_ODBC_1@ $(SAMPLES_RPATH_POSTLINK)
dbtest.app/Contents/PkgInfo: dbtest$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns dbtest.app/Contents/PkgInfo: $(__dbtest___depname) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
mkdir -p dbtest.app/Contents mkdir -p dbtest.app/Contents
mkdir -p dbtest.app/Contents/MacOS mkdir -p dbtest.app/Contents/MacOS
mkdir -p dbtest.app/Contents/Resources mkdir -p dbtest.app/Contents/Resources

4
samples/db/db.bkl
View File

@@ -3,7 +3,9 @@
<include file="../../build/bakefiles/common_samples.bkl"/> <include file="../../build/bakefiles/common_samples.bkl"/>
<exe id="dbtest" template="wx_sample" template_append="wx_append"> <exe id="dbtest"
cond="USE_ODBC=='1'"
template="wx_sample" template_append="wx_append">
<sources>dbtest.cpp listdb.cpp</sources> <sources>dbtest.cpp listdb.cpp</sources>
<wx-lib>odbc</wx-lib> <wx-lib>odbc</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>

7
samples/db/makefile.bcc
View File

@@ -147,6 +147,9 @@ __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
!if "$(WXUNIV)" == "1" !if "$(WXUNIV)" == "1"
__WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__ __WXUNIV_DEFINE_p_1 = -d__WXUNIVERSAL__
!endif !endif
!if "$(USE_ODBC)" == "1"
__dbtest___depname = $(OBJS)\dbtest.exe
!endif
all: $(OBJS) all: $(OBJS)
@@ -155,7 +158,7 @@ $(OBJS):
### Targets: ### ### Targets: ###
all: $(OBJS)\dbtest.exe all: $(__dbtest___depname)
$(OBJS)\dbtest_dbtest.obj: .\dbtest.cpp $(OBJS)\dbtest_dbtest.obj: .\dbtest.cpp
$(CXX) -q -c -P -o$@ $(DBTEST_CXXFLAGS) $** $(CXX) -q -c -P -o$@ $(DBTEST_CXXFLAGS) $**
@@ -176,7 +179,9 @@ clean:
-if exist $(OBJS)\dbtest.ilf del $(OBJS)\dbtest.ilf -if exist $(OBJS)\dbtest.ilf del $(OBJS)\dbtest.ilf
-if exist $(OBJS)\dbtest.ils del $(OBJS)\dbtest.ils -if exist $(OBJS)\dbtest.ils del $(OBJS)\dbtest.ils
!if "$(USE_ODBC)" == "1"
$(OBJS)\dbtest.exe: $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res $(OBJS)\dbtest.exe: $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res
ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__DEBUGINFO) -L$(LIBDIRNAME) -aa @&&| ilink32 -Tpe -q $(LDFLAGS) -L$(BCCDIR)\lib $(__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 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

7
samples/db/makefile.gcc
View File

@@ -154,6 +154,9 @@ endif
ifeq ($(WXUNIV),1) ifeq ($(WXUNIV),1)
__WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__ __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
endif endif
ifeq ($(USE_ODBC),1)
__dbtest___depname = $(OBJS)\dbtest.exe
endif
all: $(OBJS) all: $(OBJS)
@@ -162,7 +165,7 @@ $(OBJS):
### Targets: ### ### Targets: ###
all: $(OBJS)\dbtest.exe all: $(__dbtest___depname)
$(OBJS)\dbtest_dbtest.o: ./dbtest.cpp $(OBJS)\dbtest_dbtest.o: ./dbtest.cpp
$(CXX) -c -o $@ $(DBTEST_CXXFLAGS) $< $(CXX) -c -o $@ $(DBTEST_CXXFLAGS) $<
@@ -177,7 +180,9 @@ clean:
-if exist $(OBJS)\*.o del $(OBJS)\*.o -if exist $(OBJS)\*.o del $(OBJS)\*.o
-if exist $(OBJS)\dbtest.exe del $(OBJS)\dbtest.exe -if exist $(OBJS)\dbtest.exe del $(OBJS)\dbtest.exe
ifeq ($(USE_ODBC),1)
$(OBJS)\dbtest.exe: $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest_rc.o $(OBJS)\dbtest.exe: $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest_rc.o
$(CXX) -o $@ $(DBTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_ODBC_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 $(CXX) -o $@ $(DBTEST_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(__WXLIB_ODBC_p) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(__UNICOWS_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lodbc32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32
endif
.PHONY: all clean .PHONY: all clean

7
samples/db/makefile.vc
View File

@@ -235,6 +235,9 @@ ____DEBUGRUNTIME_2_p_1 = /d _DEBUG
!if "$(DEBUG_RUNTIME_LIBS)" == "default" !if "$(DEBUG_RUNTIME_LIBS)" == "default"
____DEBUGRUNTIME_2_p_1 = $(____DEBUGINFO_2_p_1) ____DEBUGRUNTIME_2_p_1 = $(____DEBUGINFO_2_p_1)
!endif !endif
!if "$(USE_ODBC)" == "1"
__dbtest___depname = $(OBJS)\dbtest.exe
!endif
all: $(OBJS) all: $(OBJS)
@@ -243,7 +246,7 @@ $(OBJS):
### Targets: ### ### Targets: ###
all: $(OBJS)\dbtest.exe all: $(__dbtest___depname)
$(OBJS)\dbtest_dbtest.obj: .\dbtest.cpp $(OBJS)\dbtest_dbtest.obj: .\dbtest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(DBTEST_CXXFLAGS) $** $(CXX) /c /nologo /TP /Fo$@ $(DBTEST_CXXFLAGS) $**
@@ -261,7 +264,9 @@ clean:
-if exist $(OBJS)\dbtest.ilk del $(OBJS)\dbtest.ilk -if exist $(OBJS)\dbtest.ilk del $(OBJS)\dbtest.ilk
-if exist $(OBJS)\dbtest.pdb del $(OBJS)\dbtest.pdb -if exist $(OBJS)\dbtest.pdb del $(OBJS)\dbtest.pdb
!if "$(USE_ODBC)" == "1"
$(OBJS)\dbtest.exe: $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res $(OBJS)\dbtest.exe: $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res
link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<< link /NOLOGO /OUT:$@ $(LDFLAGS) $(__DEBUGINFO_1) /LIBPATH:$(LIBDIRNAME) /SUBSYSTEM:WINDOWS @<<
$(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) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib $(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) kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib oleacc.lib
<< <<
!endif

8
samples/db/makefile.wat
View File

@@ -168,6 +168,10 @@ __WXUNIV_DEFINE_p =
!ifeq WXUNIV 1 !ifeq WXUNIV 1
__WXUNIV_DEFINE_p = -d__WXUNIVERSAL__ __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
!endif !endif
__dbtest___depname =
!ifeq USE_ODBC 1
__dbtest___depname = $(OBJS)\dbtest.exe
!endif
### Variables: ### ### Variables: ###
@@ -190,7 +194,7 @@ $(OBJS) :
### Targets: ### ### Targets: ###
all : .SYMBOLIC $(OBJS)\dbtest.exe all : .SYMBOLIC $(__dbtest___depname)
$(OBJS)\dbtest_dbtest.obj : .AUTODEPEND .\dbtest.cpp $(OBJS)\dbtest_dbtest.obj : .AUTODEPEND .\dbtest.cpp
$(CXX) -zq -fo=$^@ $(DBTEST_CXXFLAGS) $< $(CXX) -zq -fo=$^@ $(DBTEST_CXXFLAGS) $<
@@ -208,6 +212,7 @@ clean : .SYMBOLIC
-if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
-if exist $(OBJS)\dbtest.exe del $(OBJS)\dbtest.exe -if exist $(OBJS)\dbtest.exe del $(OBJS)\dbtest.exe
!ifeq USE_ODBC 1
$(OBJS)\dbtest.exe : $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res $(OBJS)\dbtest.exe : $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res
@%create $(OBJS)\dbtest.lbc @%create $(OBJS)\dbtest.lbc
@%append $(OBJS)\dbtest.lbc option quiet @%append $(OBJS)\dbtest.lbc option quiet
@@ -218,3 +223,4 @@ $(OBJS)\dbtest.exe : $(DBTEST_OBJECTS) $(OBJS)\dbtest_dbtest.res
@for %i in ( $(__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 kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\dbtest.lbc library %i @for %i in ( $(__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 kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib ) do @%append $(OBJS)\dbtest.lbc library %i
@%append $(OBJS)\dbtest.lbc option resource=$(OBJS)\dbtest_dbtest.res @%append $(OBJS)\dbtest.lbc option resource=$(OBJS)\dbtest_dbtest.res
wlink @$(OBJS)\dbtest.lbc wlink @$(OBJS)\dbtest.lbc
!endif