X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd9f42b6a94f9d68c66cf363093442b12cd4e953..70fb935a6a52fd27b288f4885c55cddf038b89f1:/demos/dbbrowse/makefile.gcc

diff --git a/demos/dbbrowse/makefile.gcc b/demos/dbbrowse/makefile.gcc
index a50bce2d49..ad5aea1406 100644
--- a/demos/dbbrowse/makefile.gcc
+++ b/demos/dbbrowse/makefile.gcc
@@ -14,9 +14,8 @@ 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$(LIBDIRNAME) -I.\..\..\src\tiff \
-	-I.\..\..\src\jpeg -I.\..\..\src\png -I.\..\..\src\zlib -I.\..\..\src\regex \
-	-I.\..\..\src\expat\lib -I. $(__DLLFLAG_p) $(CXXFLAGS)
+	$(__UNICODE_DEFINE_p) -I.\..\..\include -I$(SETUPHDIR) -I. $(__DLLFLAG_p) \
+	-I.\..\..\samples $(CXXFLAGS)
 DBBROWSE_OBJECTS =  \
 	$(OBJS)\dbbrowse_dbbrowse.o \
 	$(OBJS)\dbbrowse_doc.o \
@@ -27,16 +26,22 @@ DBBROWSE_OBJECTS =  \
 	$(OBJS)\dbbrowse_dbgrid.o \
 	$(OBJS)\dbbrowse_dlguser.o \
 	$(OBJS)\dbbrowse_dbbrowse_rc.o
-LIBDIRNAME = \
-	.\..\..\lib\gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 OBJS = \
 	gcc_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+SETUPHDIR = \
+	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 
 ### Conditionally set variables: ###
 
 ifeq ($(GCC_VERSION),2.95)
 GCCFLAGS = -fvtable-thunks
 endif
+ifeq ($(SHARED),0)
+LIBDIRNAME = .\..\..\lib\gcc_lib$(CFG)
+endif
+ifeq ($(SHARED),1)
+LIBDIRNAME = .\..\..\lib\gcc_dll$(CFG)
+endif
 ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif
@@ -119,6 +124,9 @@ endif
 ifeq ($(UNICODE),1)
 __UNICODE_DEFINE_p_1 = --define wxUSE_UNICODE=1
 endif
+ifeq ($(MSLU),1)
+__UNICOWS_LIB_p = -lunicows
+endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_ADV_p = \
 	-lwx$(PORTNAME)$(WXUNIVNAME)25$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv
@@ -152,8 +160,6 @@ ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p_1 = --define __WXUNIVERSAL__
 endif
 
-MAKEARGS = BUILD=$(BUILD) CFG=$(CFG) CPPFLAGS=$(CPPFLAGS) CXX=$(CXX) CXXFLAGS=$(CXXFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) DEBUG_INFO=$(DEBUG_INFO) GCC_VERSION=$(GCC_VERSION) LDFLAGS=$(LDFLAGS) MONOLITHIC=$(MONOLITHIC) OFFICIAL_BUILD=$(OFFICIAL_BUILD) SHARED=$(SHARED) UNICODE=$(UNICODE) USE_GUI=$(USE_GUI) WXUNIV=$(WXUNIV)
-
 
 all: $(OBJS)
 $(OBJS):
@@ -163,31 +169,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 $(LIBDIRNAME) --include-dir ./../../src/tiff --include-dir ./../../src/jpeg --include-dir ./../../src/png --include-dir ./../../src/zlib  --include-dir ./../../src/regex --include-dir ./../../src/expat/lib --include-dir . $(__DLLFLAG_p_1)
+$(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: 
@@ -195,6 +201,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)  -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