X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e6cc62c672733031e9e1eb2f97e3d81bef8d3b8f..481290e226d32e5b79597ad59e69f23a31a239dc:/samples/wxtest/Makefile.in

diff --git a/samples/wxtest/Makefile.in b/samples/wxtest/Makefile.in
index 48c7fceb96..987664bd28 100644
--- a/samples/wxtest/Makefile.in
+++ b/samples/wxtest/Makefile.in
@@ -70,38 +70,38 @@ SHARED_LD_CC = @SHARED_LD_CC@
 
 ### Conditionally set variables: ###
 
-@COND_WXUSE_ZLIBBUILTIN@__LIB_ZLIB_p = -lwxzlib
-@COND_UNICODE1@WXUNICODEFLAG = u
-@COND_BUILDDEBUG@WXDEBUGFLAG = d
-@COND_WXUSE_LIBJPEGBUILTIN@__LIB_JPEG_p = -lwxjpeg
-@COND_PLATFORM_MAC1@__wxtest___mac_setfilecmd = $(SETFILE) -a C wxtest$(EXEEXT)
-@COND_WXUSE_LIBPNGBUILTIN@LIB_PNG = wxpng
-@COND_WXUSE_ODBCBUILTIN@__LIB_ODBC_p = -lwxodbc
-@COND_PLATFORM_MAC1@__wxtest___mac_rezcmd = $(__MACOSX_RESOURCES_p)
-@COND_MONOLITHIC0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
-@COND_WXUNIV1@WXUNIVNAME = univ
-@COND_WXUNIV1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
-@COND_PLATFORM_WIN321@WXCOMPILER = _gcc
-@COND_PLATFORM_WIN321@__wxtest___win32rc = wxtest_rc.o
-@COND_WXUSE_ZLIBBUILTIN@LIB_ZLIB = wxzlib
-@COND_TOOLKITMAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
-@COND_WXUSE_LIBPNGBUILTIN@__LIB_PNG_p = -lwxpng
-@COND_PLATFORM_WIN321@DLLIMPEXT = .a
-@COND_PLATFORM_WIN320@DLLIMPEXT = .$(SO_SUFFIX)
-@COND_WXUNIV1@WXUNIV_DEFINE = __WXUNIVERSAL__
-@COND_MONOLITHIC1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
-@COND_WXUSE_LIBTIFFBUILTIN@__LIB_TIFF_p = -lwxtiff
-@COND_MONOLITHIC0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
-@COND_WXUSE_ODBCBUILTIN@LIB_ODBC = wxodbc
-@COND_MONOLITHIC1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
-@COND_WXUSE_LIBJPEGBUILTIN@LIB_JPEG = wxjpeg
-@COND_WXUSE_LIBTIFFBUILTIN@LIB_TIFF = wxtiff
-@COND_USE_GUI0@PORTNAME = base
-@COND_USE_GUI1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
-@COND_TOOLKITMAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o wxtest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
-@COND_WXUSE_REGEXBUILTIN@__LIB_REGEX_p = -lwxregex
-@COND_WXUSE_REGEXBUILTIN@LIB_REGEX = wxregex
-@COND_DEPS_TYPEGCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d
+@COND_WXUSE_ZLIB_BUILTIN@__LIB_ZLIB_p = -lwxzlib
+@COND_UNICODE_1@WXUNICODEFLAG = u
+@COND_BUILD_DEBUG@WXDEBUGFLAG = d
+@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
+@COND_PLATFORM_MAC_1@__wxtest___mac_setfilecmd = $(SETFILE) -a C wxtest$(EXEEXT)
+@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
+@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc
+@COND_PLATFORM_MAC_1@__wxtest___mac_rezcmd = $(__MACOSX_RESOURCES_p)
+@COND_MONOLITHIC_0@__WXLIB_CORE_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
+@COND_WXUNIV_1@WXUNIVNAME = univ
+@COND_WXUNIV_1@__WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
+@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
+@COND_PLATFORM_WIN32_1@__wxtest___win32rc = wxtest_rc.o
+@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
+@COND_TOOLKIT_MAC@MACOSX_RESOURCES = Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
+@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
+@COND_PLATFORM_WIN32_1@DLLIMPEXT = .a
+@COND_PLATFORM_WIN32_0@DLLIMPEXT = .$(SO_SUFFIX)
+@COND_WXUNIV_1@WXUNIV_DEFINE = __WXUNIVERSAL__
+@COND_MONOLITHIC_1@WXLIB_MONO = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
+@COND_WXUSE_LIBTIFF_BUILTIN@__LIB_TIFF_p = -lwxtiff
+@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
+@COND_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
+@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
+@COND_WXUSE_LIBJPEG_BUILTIN@LIB_JPEG = wxjpeg
+@COND_WXUSE_LIBTIFF_BUILTIN@LIB_TIFF = wxtiff
+@COND_USE_GUI_0@PORTNAME = base
+@COND_USE_GUI_1@PORTNAME = $(TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ -d $(WXUNIV_DEFINE) -i $(srcdir)/../../include -i $(srcdir) -o wxtest$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
+@COND_WXUSE_REGEX_BUILTIN@__LIB_REGEX_p = -lwxregex
+@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex
+@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d
 
 ### Targets: ###
 
@@ -122,7 +122,7 @@ clean:
 install: all
 
 wxtest$(EXEEXT): wxtest.o $(__wxtest___win32rc)
-	$(CXX) -o $@  wxtest.o $(__wxtest___win32rc)  -L$(top_builddir)/lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p)
+	$(CXX) -o $@  wxtest.o $(__wxtest___win32rc)  -L$(top_builddir)lib $(__WXLIB_MONO_p) $(SAMPLES_RPATH_FLAG) $(__WXLIB_CORE_p) $(EXTRALIBS) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(__LIB_ZLIB_p) $(__LIB_TIFF_p) $(__LIB_ODBC_p) $(__LIB_REGEX_p)
 	$(__wxtest___mac_rezcmd)
 	$(__wxtest___mac_setfilecmd)