X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e8f60bac1ab18be00b4e433f5db7b0261c5f17da..aa992c594e2bc490ff2ccd34bd8b4963150c33ff:/demos/dbbrowse/Makefile.in

diff --git a/demos/dbbrowse/Makefile.in b/demos/dbbrowse/Makefile.in
index 83a4f5128d..98141554ab 100644
--- a/demos/dbbrowse/Makefile.in
+++ b/demos/dbbrowse/Makefile.in
@@ -13,6 +13,7 @@ INSTALL = @INSTALL@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
+EXEEXT = @EXEEXT@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
@@ -50,6 +51,8 @@ WX_VERSION = 2.5.0
 
 ### Conditionally set variables: ###
 
+@COND_DEPS_TRACKING_0@CXXC = $(CXX)
+@COND_DEPS_TRACKING_1@CXXC = $(top_builddir)./bk-deps $(CXX)
 @COND_USE_GUI_0@PORTNAME = base
 @COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
 @COND_TOOLKIT_MAC@WXBASEPORT = _carbon
@@ -79,7 +82,7 @@ WX_VERSION = 2.5.0
 @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 -i $(srcdir) \
-	$(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dbbrowse Carbon.r \
+	$(__DLLFLAG_p_1) -i $(srcdir)/../../samples -o dbbrowse$(EXEEXT) Carbon.r \
 	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 COND_MONOLITHIC_0___WXLIB_ADV_p = \
@@ -106,27 +109,28 @@ COND_MONOLITHIC_0___WXLIB_ODBC_p = \
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
 @COND_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
 @COND_PLATFORM_MAC_1@__dbbrowse___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
-@COND_PLATFORM_MAC_1@__dbbrowse___mac_setfilecmd = $(SETFILE) -a C dbbrowse
+@COND_PLATFORM_MAC_1@__dbbrowse___mac_setfilecmd = \
+@COND_PLATFORM_MAC_1@	$(SETFILE) -a C dbbrowse$(EXEEXT)
 @COND_PLATFORM_WIN32_1@__dbbrowse___win32rc = dbbrowse_dbbrowse_rc.o
 @COND_PLATFORM_MACOSX_1@__dbbrowse_bundle___depname = dbbrowse_bundle
 
 ### Targets: ###
 
-all: dbbrowse $(__dbbrowse_bundle___depname)
+all: dbbrowse$(EXEEXT) $(__dbbrowse_bundle___depname)
 
 clean: 
 	rm -rf ./.deps ./.pch
 	rm -f ./*.o
-	rm -f dbbrowse
+	rm -f dbbrowse$(EXEEXT)
 	rm -rf dbbrowse.app
 
-dbbrowse: $(DBBROWSE_OBJECTS) $(__dbbrowse___win32rc)
+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)
 	$(__dbbrowse___mac_rezcmd)
 	$(__dbbrowse___mac_setfilecmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-dbbrowse.app/Contents: dbbrowse $(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).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
 	mkdir -p dbbrowse.app/Contents
 	mkdir -p dbbrowse.app/Contents/MacOS
 	mkdir -p dbbrowse.app/Contents/Resources
@@ -141,40 +145,40 @@ dbbrowse.app/Contents: dbbrowse $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME
 	echo -n "APPL????" >dbbrowse.app/Contents/PkgInfo
 	
 	
-	ln -f dbbrowse dbbrowse.app/Contents/MacOS/dbbrowse
+	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
 
 dbbrowse_browsedb.o: $(srcdir)/browsedb.cpp
-	$(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+	$(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
-	$(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+	$(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 --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples
 
 dbbrowse_dbgrid.o: $(srcdir)/dbgrid.cpp
-	$(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
 
 dbbrowse_dbtree.o: $(srcdir)/dbtree.cpp
-	$(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
 
 dbbrowse_dlguser.o: $(srcdir)/dlguser.cpp
-	$(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
 
 dbbrowse_doc.o: $(srcdir)/doc.cpp
-	$(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
 
 dbbrowse_pgmctrl.o: $(srcdir)/pgmctrl.cpp
-	$(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
 
 dbbrowse_tabpgwin.o: $(srcdir)/tabpgwin.cpp
-	$(CXX) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
+	$(CXXC) -c -o $@ $(DBBROWSE_CXXFLAGS) $<
 
 distclean: clean
 	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile