X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab892b9519be1eb18beb27928c767203809dce12..cffadd8447201d0e2e1b3de6f8a24b967da9140c:/demos/dbbrowse/Makefile.in?ds=sidebyside

diff --git a/demos/dbbrowse/Makefile.in b/demos/dbbrowse/Makefile.in
index 96301fbf7c..34a135f1e8 100644
--- a/demos/dbbrowse/Makefile.in
+++ b/demos/dbbrowse/Makefile.in
@@ -16,9 +16,12 @@ CXXFLAGS = @CXXFLAGS@
 EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
+EXTRALIBS_HTML = @EXTRALIBS_HTML@
+EXTRALIBS_ODBC = @EXTRALIBS_ODBC@
 HOST_SUFFIX = @HOST_SUFFIX@
 LDFLAGS = @LDFLAGS@
 LDFLAGS_GUI = @LDFLAGS_GUI@
+NM = @NM@
 RESCOMP = @RESCOMP@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
@@ -33,11 +36,11 @@ top_srcdir = @top_srcdir@
 
 ### Variables: ###
 
-DBBROWSE_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
-	-I$(top_srcdir)/include $(__INC_TIFF_p) $(__INC_JPEG_p) $(__INC_PNG_p) \
-	$(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) $(__INC_EXPAT_p) \
-	-I$(srcdir) $(__DLLFLAG_p) -I$(srcdir)/../../samples $(CXXFLAGS)
+DBBROWSE_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
+	-I$(top_srcdir)/include -I$(srcdir) $(__DLLFLAG_p) \
+	-I$(srcdir)/../../samples $(CPPFLAGS) $(CXXFLAGS)
 DBBROWSE_OBJECTS =  \
+	$(__dbbrowse_os2_lib_res) \
 	dbbrowse_dbbrowse.o \
 	dbbrowse_doc.o \
 	dbbrowse_pgmctrl.o \
@@ -47,7 +50,9 @@ DBBROWSE_OBJECTS =  \
 	dbbrowse_dbgrid.o \
 	dbbrowse_dlguser.o \
 	$(__dbbrowse___win32rc)
+DESTDIR = 
 LIBDIRNAME = $(top_builddir)lib
+WX_VERSION = 2.5.1
 
 ### Conditionally set variables: ###
 
@@ -63,34 +68,6 @@ LIBDIRNAME = $(top_builddir)lib
 @COND_SHARED_1@__DLLFLAG_p = -DWXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_1 = -d WXUSINGDLL
 @COND_SHARED_1@__DLLFLAG_p_2 = --define WXUSINGDLL
-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p = -I$(top_srcdir)/src/expat/lib
-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_1 = -i $(top_srcdir)/src/expat/lib
-@COND_WXUSE_EXPAT_BUILTIN@__INC_EXPAT_p_2 = \
-@COND_WXUSE_EXPAT_BUILTIN@	--include-dir $(top_srcdir)/src/expat/lib
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p = -I$(top_srcdir)/src/jpeg
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_1 = -i $(top_srcdir)/src/jpeg
-@COND_WXUSE_LIBJPEG_BUILTIN@__INC_JPEG_p_2 = \
-@COND_WXUSE_LIBJPEG_BUILTIN@	--include-dir $(top_srcdir)/src/jpeg
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p = -I$(top_srcdir)/src/odbc
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_1 = -i $(top_srcdir)/src/odbc
-@COND_WXUSE_ODBC_BUILTIN@__INC_ODBC_p_2 = \
-@COND_WXUSE_ODBC_BUILTIN@	--include-dir $(top_srcdir)/src/odbc
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p = -I$(top_srcdir)/src/png
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_1 = -i $(top_srcdir)/src/png
-@COND_WXUSE_LIBPNG_BUILTIN@__INC_PNG_p_2 = \
-@COND_WXUSE_LIBPNG_BUILTIN@	--include-dir $(top_srcdir)/src/png
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p = -I$(top_srcdir)/src/regex
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_1 = -i $(top_srcdir)/src/regex
-@COND_WXUSE_REGEX_BUILTIN@__INC_REGEX_p_2 = \
-@COND_WXUSE_REGEX_BUILTIN@	--include-dir $(top_srcdir)/src/regex
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p = -I$(top_srcdir)/src/tiff
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_1 = -i $(top_srcdir)/src/tiff
-@COND_WXUSE_LIBTIFF_BUILTIN@__INC_TIFF_p_2 = \
-@COND_WXUSE_LIBTIFF_BUILTIN@	--include-dir $(top_srcdir)/src/tiff
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p = -I$(top_srcdir)/src/zlib
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_1 = -i $(top_srcdir)/src/zlib
-@COND_WXUSE_ZLIB_BUILTIN@__INC_ZLIB_p_2 = \
-@COND_WXUSE_ZLIB_BUILTIN@	--include-dir $(top_srcdir)/src/zlib
 @COND_WXUSE_EXPAT_BUILTIN@__LIB_EXPAT_p = \
 @COND_WXUSE_EXPAT_BUILTIN@	-lwxexpat$(WXDEBUGFLAG)$(HOST_SUFFIX)
 @COND_USE_GUI_1_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p \
@@ -109,11 +86,9 @@ LIBDIRNAME = $(top_builddir)lib
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(HOST_SUFFIX)
 COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
-	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include \
-	$(__INC_TIFF_p_1) $(__INC_JPEG_p_1) $(__INC_PNG_p_1) $(__INC_ZLIB_p_1) \
-	$(__INC_ODBC_p_1) $(__INC_REGEX_p_1) $(__INC_EXPAT_p_1) -i $(srcdir) \
+	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(top_srcdir)/include -i $(srcdir) \
 	$(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dbbrowse$(EXEEXT) Carbon.r \
-	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
+	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
 	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_adv-2.5$(HOST_SUFFIX)
@@ -141,8 +116,13 @@ COND_MONOLITHIC_0___WXLIB_ODBC_p = \
 @COND_PLATFORM_MAC_1@__dbbrowse___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
 @COND_PLATFORM_MAC_1@__dbbrowse___mac_setfilecmd = \
 @COND_PLATFORM_MAC_1@	$(SETFILE) -a C dbbrowse$(EXEEXT)
+COND_PLATFORM_OS2_1___dbbrowse___os2_emxbindcmd = $(NM) dbbrowse$(EXEEXT) | if \
+	grep -q pmwin.763 ; then emxbind -ep dbbrowse$(EXEEXT) ; fi
+@COND_PLATFORM_OS2_1@__dbbrowse___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___dbbrowse___os2_emxbindcmd)
 @COND_PLATFORM_WIN32_1@__dbbrowse___win32rc = dbbrowse_dbbrowse_rc.o
 @COND_PLATFORM_MACOSX_1@__dbbrowse_bundle___depname = dbbrowse_bundle
+@COND_PLATFORM_OS2_1@__dbbrowse_os2_lib_res = \
+@COND_PLATFORM_OS2_1@	$(top_srcdir)/include/wx/os2/wx.res
 
 ### Targets: ###
 
@@ -155,12 +135,13 @@ clean:
 	rm -rf dbbrowse.app
 
 dbbrowse$(EXEEXT): $(DBBROWSE_OBJECTS) $(__dbbrowse___win32rc)
-	$(CXX) -o $@ $(DBBROWSE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__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) $(__LIB_ZLIB_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS) $(EXTRALIBS_GUI)
+	$(CXX) -o $@ $(DBBROWSE_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  $(__WXLIB_DBGRID_p)  $(__WXLIB_ADV_p)  $(__WXLIB_ODBC_p) $(EXTRALIBS_ODBC) $(__WXLIB_HTML_p) $(EXTRALIBS_HTML) $(__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)
 	$(__dbbrowse___mac_rezcmd)
 	$(__dbbrowse___mac_setfilecmd)
+	$(__dbbrowse___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-dbbrowse.app/Contents: dbbrowse$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
+dbbrowse.app/Contents/PkgInfo: dbbrowse$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p dbbrowse.app/Contents
 	mkdir -p dbbrowse.app/Contents/MacOS
 	mkdir -p dbbrowse.app/Contents/Resources
@@ -168,7 +149,7 @@ dbbrowse.app/Contents: dbbrowse$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
 	
 	sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
 	-e "s/EXECUTABLE/dbbrowse/" \
-	-e "s/VERSION/2.5.0/" \
+	-e "s/VERSION/$(WX_VERSION)/" \
 	$(top_srcdir)/src/mac/Info.plist.in >dbbrowse.app/Contents/Info.plist
 	
 	
@@ -178,19 +159,19 @@ dbbrowse.app/Contents: dbbrowse$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(L
 	ln -f dbbrowse$(EXEEXT) dbbrowse.app/Contents/MacOS/dbbrowse
 	
 	
-	ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc dbbrowse.app/Contents/Resources/dbbrowse.rsrc
-	ln -f $(top_srcdir)/src/mac/wxmac.icns dbbrowse.app/Contents/Resources/wxmac.icns
+	ln -sf $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc dbbrowse.app/Contents/Resources/dbbrowse.rsrc
+	ln -sf $(top_srcdir)/src/mac/wxmac.icns dbbrowse.app/Contents/Resources/wxmac.icns
 
 dbbrowse_browsedb.o: $(srcdir)/browsedb.cpp
 	$(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
 
-@COND_PLATFORM_MACOSX_1@dbbrowse_bundle: dbbrowse.app/Contents
+@COND_PLATFORM_MACOSX_1@dbbrowse_bundle: dbbrowse.app/Contents/PkgInfo
 
 dbbrowse_dbbrowse.o: $(srcdir)/dbbrowse.cpp
 	$(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
 
 dbbrowse_dbbrowse_rc.o: $(srcdir)/dbbrowse.rc
-	$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include $(__INC_TIFF_p_2) $(__INC_JPEG_p_2) $(__INC_PNG_p_2) $(__INC_ZLIB_p_2) $(__INC_ODBC_p_2) $(__INC_REGEX_p_2) $(__INC_EXPAT_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
+	$(RESCOMP) -i$< -o$@  --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2)   --include-dir $(top_srcdir)/include --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
 
 dbbrowse_dbgrid.o: $(srcdir)/dbgrid.cpp
 	$(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<