regenerated makefiles, with support for multilib build

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21389 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2003-06-25 15:13:17 +00:00
parent 60c0a8dbf4
commit 9747f85dad
76 changed files with 9649 additions and 4698 deletions

View File

@@ -74,30 +74,34 @@ SHARED_LD_CC = @SHARED_LD_CC@
@COND_UNICODE_1@WXUNICODEFLAG = u
@COND_BUILD_DEBUG@WXDEBUGFLAG = d
@COND_PLATFORM_WIN32_1@__opengl___win32rc = opengl_rc.o
@COND_WXUSE_LIBPNG_BUILTIN@__LIB_PNG_p = -lwxpng
@COND_WXUSE_LIBPNG_BUILTIN@LIB_PNG = wxpng
@COND_WXUSE_ODBC_BUILTIN@__LIB_ODBC_p = -lwxodbc
@COND_WXUSE_LIBJPEG_BUILTIN@__LIB_JPEG_p = -lwxjpeg
@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_WXUSE_ODBC_BUILTIN@LIB_ODBC = wxodbc
@COND_PLATFORM_WIN32_1@WXCOMPILER = _gcc
@COND_WXUSE_ZLIB_BUILTIN@LIB_ZLIB = wxzlib
@COND_PLATFORM_MAC_1@__opengl___mac_rezcmd = $(__MACOSX_RESOURCES_p)
@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_MONOLITHIC_0@WXLIB_BASE = wx$(WXUNICODEFLAG)$(WXDEBUGFLAG)_base-2.5
@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_WXUNIV_1@__WXUNIV_DEFINE_p_2 = --define __WXUNIVERSAL__
@COND_MONOLITHIC_0@WXLIB_HTML = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_html-2.5
@COND_MONOLITHIC_1@__WXLIB_MONO_p = -lwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5
@COND_MONOLITHIC_0@WXLIB_CORE = wx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)_core-2.5
@COND_WXUNIV_1@__WXUNIV_DEFINE_p_1 = -d __WXUNIVERSAL__
@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 opengl$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
@COND_TOOLKIT_MAC@__MACOSX_RESOURCES_p = $(RESCOMP) -d __DARWIN__ -t APPL -d __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) -i $(srcdir)/../../include -i $(srcdir) -o opengl$(EXEEXT) Carbon.r ../../lib/libwx_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5.0.r
@COND_PLATFORM_MAC_1@__opengl___mac_setfilecmd = $(SETFILE) -a C opengl$(EXEEXT)
@COND_WXUSE_REGEX_BUILTIN@LIB_REGEX = wxregex
@COND_DEPS_TYPE_GCC@DEPS_FLAG = -MMD -MT$@ -MF$@.d
@@ -113,7 +117,7 @@ opengl.o: $(srcdir)/opengl.cpp
install-strip: install
opengl_rc.o: $(srcdir)/opengl.rc
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ --define $(WXUNIV_DEFINE) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
$(RESCOMP) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) --include-dir $(srcdir)/../../include --include-dir $(srcdir)
clean:
rm -f ./*.o ./*.d