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

Make wxTinderbox pass dialup sample for DOS cross-build.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38028 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-03-12 14:34:31 +00:00
parent 2e1f50128a
commit a862f3cc19
3 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
samples/dialup/Makefile.in
View File

@@ -63,6 +63,7 @@ NETTEST_OBJECTS = \
@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_MSDOS_0@__nettest___depname = nettest$(EXEEXT)
@COND_PLATFORM_MAC_1@__nettest___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C nettest$(EXEEXT)
@COND_PLATFORM_MAC_1@__nettest___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@@ -132,7 +133,7 @@ COND_TOOLKIT_MAC___MACOSX_RESOURCES_p_1 = $(REZ) -d __DARWIN__ -t APPL -d \
### Targets: ###
all: nettest$(EXEEXT) $(__nettest_bundle___depname)
all: $(__nettest___depname) $(__nettest_bundle___depname)
install: all
@@ -149,14 +150,14 @@ clean:
distclean: clean
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc)
$(CXX) -o $@ $(NETTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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)
$(__nettest___mac_rezcmd)
$(__nettest___mac_setfilecmd)
$(__nettest___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
@COND_PLATFORM_MSDOS_0@nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc)
@COND_PLATFORM_MSDOS_0@ $(CXX) -o $@ $(NETTEST_OBJECTS) $(LDFLAGS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(__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)
@COND_PLATFORM_MSDOS_0@ $(__nettest___mac_rezcmd)
@COND_PLATFORM_MSDOS_0@ $(__nettest___mac_setfilecmd)
@COND_PLATFORM_MSDOS_0@ $(__nettest___os2_emxbindcmd)
@COND_PLATFORM_MSDOS_0@ $(SAMPLES_RPATH_POSTLINK)
nettest.app/Contents/PkgInfo: nettest$(EXEEXT) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
nettest.app/Contents/PkgInfo: $(__nettest___depname) $(top_srcdir)/src/mac/carbon/Info.plist.in $(top_srcdir)/src/mac/carbon/wxmac.icns
mkdir -p nettest.app/Contents
mkdir -p nettest.app/Contents/MacOS
mkdir -p nettest.app/Contents/Resources

4
samples/dialup/dialup.bkl
View File

@@ -3,7 +3,9 @@
<include file="../../build/bakefiles/common_samples.bkl"/>
<exe id="nettest" template="wx_sample" template_append="wx_append">
<exe id="nettest" template="wx_sample"
template_append="wx_append"
cond="PLATFORM_MSDOS=='0'">
<sources>nettest.cpp</sources>
<wx-lib>core</wx-lib>
<wx-lib>base</wx-lib>