fixed bakefile so that in-tree headers take precedence over system-installed ones

[wxWidgets.git] / demos / dbbrowse / makefile.gcc

diff --git a/demos/dbbrowse/makefile.gcc b/demos/dbbrowse/makefile.gcc
index feb4692ee79eeb0222e9dbd3ceff1395b42cc131..49ece2a09d83ba22eaeac77c2f31f4bdb9abbe79 100644 (file)
--- a/demos/dbbrowse/makefile.gcc
+++ b/demos/dbbrowse/makefile.gcc
@@ -14,8 +14,9 @@ include ../../build/msw/config.gcc
 
 DBBROWSE_CXXFLAGS = $(CPPFLAGS) $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(GCCFLAGS) \
        -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
-       $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \
-       -I.\..\..\samples $(CXXFLAGS)
+       $(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -Wall -I. \
+       $(__DLLFLAG_p) -I.\..\..\samples $(CXXFLAGS) $(__EXCEPTIONSFLAG_4) \
+       $(__EXCEPTIONSFLAG_5)
 DBBROWSE_OBJECTS =  \
        $(OBJS)\dbbrowse_dbbrowse.o \
        $(OBJS)\dbbrowse_doc.o \
@@ -103,6 +104,18 @@ endif
 ifeq ($(SHARED),1)
 __DLLFLAG_p_1 = --define WXUSINGDLL
 endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_4 = -fno-rtti
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_4 = 
+endif
+ifeq ($(USE_EXCEPTIONS),0)
+__EXCEPTIONSFLAG_5 = -fno-exceptions
+endif
+ifeq ($(USE_EXCEPTIONS),1)
+__EXCEPTIONSFLAG_5 = 
+endif
 ifeq ($(USE_GUI),1)
 __LIB_JPEG_p = -lwxjpeg$(WXDEBUGFLAG)
 endif
@@ -119,10 +132,10 @@ ifeq ($(BUILD),release)
 __OPTIMIZEFLAG_2 = -O2
 endif
 ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p = -DwxUSE_UNICODE=1
+__UNICODE_DEFINE_p = -D_UNICODE
 endif
 ifeq ($(UNICODE),1)
-__UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
+__UNICODE_DEFINE_p_1 = --define _UNICODE
 endif
 ifeq ($(MSLU),1)
 __UNICOWS_LIB_p = -lunicows
@@ -169,31 +182,31 @@ $(OBJS):
 
 all: $(OBJS)\dbbrowse.exe
 
-$(OBJS)\dbbrowse_browsedb.o: .\browsedb.cpp
+$(OBJS)\dbbrowse_browsedb.o: ./browsedb.cpp
        $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
 
-$(OBJS)\dbbrowse_dbbrowse.o: .\dbbrowse.cpp
+$(OBJS)\dbbrowse_dbbrowse.o: ./dbbrowse.cpp
        $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
 
-$(OBJS)\dbbrowse_dbbrowse_rc.o: .\dbbrowse.rc
-       windres --use-temp-file -i$< -o$@ --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
+$(OBJS)\dbbrowse_dbbrowse_rc.o: ./dbbrowse.rc
+       windres --use-temp-file -i$< -o$@  --define __WXMSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) --include-dir ./../../include --include-dir $(SETUPHDIR) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples
 
-$(OBJS)\dbbrowse_dbgrid.o: .\dbgrid.cpp
+$(OBJS)\dbbrowse_dbgrid.o: ./dbgrid.cpp
        $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
 
-$(OBJS)\dbbrowse_dbtree.o: .\dbtree.cpp
+$(OBJS)\dbbrowse_dbtree.o: ./dbtree.cpp
        $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
 
-$(OBJS)\dbbrowse_dlguser.o: .\dlguser.cpp
+$(OBJS)\dbbrowse_dlguser.o: ./dlguser.cpp
        $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
 
-$(OBJS)\dbbrowse_doc.o: .\doc.cpp
+$(OBJS)\dbbrowse_doc.o: ./doc.cpp
        $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
 
-$(OBJS)\dbbrowse_pgmctrl.o: .\pgmctrl.cpp
+$(OBJS)\dbbrowse_pgmctrl.o: ./pgmctrl.cpp
        $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
 
-$(OBJS)\dbbrowse_tabpgwin.o: .\tabpgwin.cpp
+$(OBJS)\dbbrowse_tabpgwin.o: ./tabpgwin.cpp
        $(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
 
 clean: 
@@ -201,6 +214,6 @@ clean:
        -if exist $(OBJS)\dbbrowse.exe del $(OBJS)\dbbrowse.exe
 
 $(OBJS)\dbbrowse.exe: $(DBBROWSE_OBJECTS) $(OBJS)\dbbrowse_dbbrowse_rc.o
-       $(CXX) -o $@ $(DBBROWSE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_DBGRID_p) $(__WXLIB_ADV_p) $(__WXLIB_ODBC_p) $(__WXLIB_HTML_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 $@ $(DBBROWSE_OBJECTS) $(LDFLAGS) $(__DEBUGINFO) -mthreads -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows  $(__WXLIB_DBGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_ODBC_p)  $(__WXLIB_HTML_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
 
 .PHONY: all clean