Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated makefiles etc. for 2.5.1

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23603 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2003-09-15 15:36:27 +00:00
parent 70fb935a6a
commit ec08d395bd
861 changed files with 22670 additions and 18516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
samples/html/virtual/Makefile.in
View File

@@ -19,6 +19,7 @@ EXTRALIBS_GUI = @EXTRALIBS_GUI@
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@
@@ -40,7 +41,7 @@ VIRTUAL_CXXFLAGS = $(CPPFLAGS) -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \
VIRTUAL_OBJECTS = \
virtual_virtual.o \
$(__virtual___win32rc)
WX_VERSION = 2.5.0
WX_VERSION = 2.5.1
### Conditionally set variables: ###
@@ -76,7 +77,7 @@ WX_VERSION = 2.5.0
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 virtual$(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_BASE_p = \
@COND_MONOLITHIC_0@ -lwx_base$(WXBASEPORT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)-2.5$(HOST_SUFFIX)
@@ -95,6 +96,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_PLATFORM_MAC_1@__virtual___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@COND_PLATFORM_MAC_1@__virtual___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C virtual$(EXEEXT)
COND_PLATFORM_OS2_1___virtual___os2_emxbindcmd = $(NM) virtual$(EXEEXT) | if \
grep -q pmwin.763 ; then emxbind -ep virtual$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__virtual___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___virtual___os2_emxbindcmd)
@COND_PLATFORM_WIN32_1@__virtual___win32rc = virtual_virtual_rc.o
@COND_PLATFORM_MACOSX_1@__virtual_bundle___depname = virtual_bundle
@@ -126,12 +130,13 @@ install-strip: install
uninstall:
virtual$(EXEEXT): $(VIRTUAL_OBJECTS) $(__virtual___win32rc)
$(CXX) -o $@ $(VIRTUAL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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 $@ $(VIRTUAL_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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)
$(__virtual___mac_rezcmd)
$(__virtual___mac_setfilecmd)
$(__virtual___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc $(top_srcdir)/src/mac/wxmac.icns
mkdir -p virtual.app/Contents
mkdir -p virtual.app/Contents/MacOS
mkdir -p virtual.app/Contents/Resources
@@ -149,7 +154,7 @@ virtual.app/Contents/PkgInfo: virtual$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.
ln -f virtual$(EXEEXT) virtual.app/Contents/MacOS/virtual
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc virtual.app/Contents/Resources/virtual.rsrc
ln -f $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).1.rsrc virtual.app/Contents/Resources/virtual.rsrc
ln -f $(top_srcdir)/src/mac/wxmac.icns virtual.app/Contents/Resources/wxmac.icns
@COND_PLATFORM_MACOSX_1@virtual_bundle: virtual.app/Contents/PkgInfo
@@ -158,7 +163,7 @@ virtual_virtual.o: $(srcdir)/virtual.cpp
$(CXXC) -c -o $@ $(VIRTUAL_CXXFLAGS) $<
virtual_virtual_rc.o: $(srcdir)/virtual.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
$(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
# Include dependency info, if present: