X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ceec2216bd3c65103e51a4ed9927f90fc1291d9c..3a3013019a93ae68757a501fd0b732290bc62ade:/contrib/samples/gizmos/dynsash_switch/Makefile.in?ds=inline

diff --git a/contrib/samples/gizmos/dynsash_switch/Makefile.in b/contrib/samples/gizmos/dynsash_switch/Makefile.in
index 7885ad382e..c6478800b1 100644
--- a/contrib/samples/gizmos/dynsash_switch/Makefile.in
+++ b/contrib/samples/gizmos/dynsash_switch/Makefile.in
@@ -22,6 +22,7 @@ CXX = @CXX@
 CXXFLAGS = @CXXFLAGS@
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
+WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 TOOLKIT = @TOOLKIT@
 TOOLKIT_LOWERCASE = @TOOLKIT_LOWERCASE@
 TOOLKIT_VERSION = @TOOLKIT_VERSION@
@@ -29,15 +30,14 @@ TOOLCHAIN_NAME = @TOOLCHAIN_NAME@
 EXTRALIBS = @EXTRALIBS@
 EXTRALIBS_GUI = @EXTRALIBS_GUI@
 HOST_SUFFIX = @HOST_SUFFIX@
-WX_LIB_FLAVOUR = @WX_LIB_FLAVOUR@
 SAMPLES_RPATH_FLAG = @SAMPLES_RPATH_FLAG@
 SAMPLES_RPATH_POSTLINK = @SAMPLES_RPATH_POSTLINK@
 
 ### Variables: ###
 
 DESTDIR = 
-WX_VERSION = 2.5.2
 WX_RELEASE = 2.5
+WX_VERSION = $(WX_RELEASE).3
 LIBDIRNAME = $(top_builddir)lib
 DYNSASH_SWITCH_CXXFLAGS = -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) -I$(srcdir) \
 	$(__DLLFLAG_p) -I$(srcdir)/../../../../samples \
@@ -58,6 +58,10 @@ DYNSASH_SWITCH_OBJECTS =  \
 @COND_DEBUG_FLAG_1@WXDEBUGFLAG = d
 @COND_UNICODE_1@WXUNICODEFLAG = u
 @COND_WXUNIV_1@WXUNIVNAME = univ
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_BASE = $(EXTRALIBS)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_BASE = $(EXTRALIBS) $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_0@EXTRALIBS_FOR_GUI = $(EXTRALIBS_GUI)
+@COND_MONOLITHIC_1@EXTRALIBS_FOR_GUI = 
 @COND_PLATFORM_MAC_1@__dynsash_switch___mac_setfilecmd \
 @COND_PLATFORM_MAC_1@	= $(SETFILE) -a C dynsash_switch$(EXEEXT)
 @COND_PLATFORM_MAC_1@__dynsash_switch___mac_rezcmd = \
@@ -83,13 +87,13 @@ COND_PLATFORM_OS2_1___dynsash_switch___os2_emxbindcmd = $(NM) \
 @COND_TOOLKIT_MAC@____dynsash_switch_BUNDLE_TGT_REF_DEP = \
 @COND_TOOLKIT_MAC@	dynsash_switch.app/Contents/PkgInfo
 COND_MONOLITHIC_0___WXLIB_CORE_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-2.5$(HOST_SUFFIX)
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_core-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_CORE_p = $(COND_MONOLITHIC_0___WXLIB_CORE_p)
 COND_MONOLITHIC_0___WXLIB_BASE_p = \
-	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-2.5$(HOST_SUFFIX)
+	-lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_0@__WXLIB_BASE_p = $(COND_MONOLITHIC_0___WXLIB_BASE_p)
 COND_MONOLITHIC_1___WXLIB_MONO_p = \
-	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-2.5$(HOST_SUFFIX)
+	-lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_MONOLITHIC_1@__WXLIB_MONO_p = $(COND_MONOLITHIC_1___WXLIB_MONO_p)
 @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p \
 @COND_USE_GUI_1_WXUSE_LIBTIFF_BUILTIN@	= \
@@ -103,7 +107,7 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
 @COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = \
 @COND_WXUSE_ZLIB_BUILTIN@	-lwxzlib$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = \
-@COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(HOST_SUFFIX)
+@COND_WXUSE_ODBC_BUILTIN@	-lwxodbc$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p = \
 	-lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)-$(WX_RELEASE)$(HOST_SUFFIX)
 @COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = $(COND_WXUSE_REGEX_BUILTIN___LIB_REGEX_p)
@@ -113,7 +117,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(RESCOMP) -d __DARWIN__ -t APPL -d \
 	__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir) $(__DLLFLAG_p_1) -i \
 	$(srcdir)/../../../../samples -i $(top_srcdir)/include -i \
 	$(srcdir)/../../../include -o dynsash_switch$(EXEEXT) Carbon.r \
-	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.r sample.r
+	$(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.r sample.r
 @COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p_1 = $(COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1)
 
 ### Targets: ###
@@ -136,13 +140,13 @@ distclean: clean
 	rm -f configure config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
 
 dynsash_switch$(EXEEXT): $(DYNSASH_SWITCH_OBJECTS) $(__dynsash_switch___win32rc)
-	$(CXX) -o $@ $(DYNSASH_SWITCH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-2.5$(HOST_SUFFIX)  $(__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 $@ $(DYNSASH_SWITCH_OBJECTS) $(LDFLAGS)   -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG)  -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_gizmos-$(WX_RELEASE)$(HOST_SUFFIX)  $(__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_FOR_BASE) $(EXTRALIBS_FOR_GUI)
 	$(__dynsash_switch___mac_rezcmd)
 	$(__dynsash_switch___mac_setfilecmd)
 	$(__dynsash_switch___os2_emxbindcmd)
 	$(SAMPLES_RPATH_POSTLINK)
 
-dynsash_switch.app/Contents/PkgInfo: dynsash_switch$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
+dynsash_switch.app/Contents/PkgInfo: dynsash_switch$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc $(top_srcdir)/src/mac/carbon/wxmac.icns
 	mkdir -p dynsash_switch.app/Contents
 	mkdir -p dynsash_switch.app/Contents/MacOS
 	mkdir -p dynsash_switch.app/Contents/Resources
@@ -160,7 +164,7 @@ dynsash_switch.app/Contents/PkgInfo: dynsash_switch$(EXEEXT) $(top_srcdir)/src/m
 	ln -f dynsash_switch$(EXEEXT) dynsash_switch.app/Contents/MacOS/dynsash_switch
 	
 	
-	cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).2.rsrc dynsash_switch.app/Contents/Resources/dynsash_switch.rsrc
+	cp -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).3.rsrc dynsash_switch.app/Contents/Resources/dynsash_switch.rsrc
 	cp -f $(top_srcdir)/src/mac/carbon/wxmac.icns dynsash_switch.app/Contents/Resources/wxmac.icns
 
 @COND_PLATFORM_MACOSX_1@dynsash_switch_bundle: $(____dynsash_switch_BUNDLE_TGT_REF_DEP)