Remove MS-DOS source files.
Last work on the MS-DOS files was 10 years ago and it's not a viable platform in 2015 any more.
This commit is contained in:
committed by
Tobias Taschner
parent
e77c48331b
commit
26a0a24f38
@@ -67,7 +67,6 @@ NETTEST_OBJECTS = \
|
||||
@COND_MONOLITHIC_1@ $(EXTRALIBS_XML) $(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_0@__nettest___mac_setfilecmd = @true
|
||||
@COND_PLATFORM_MAC_1@__nettest___mac_setfilecmd = \
|
||||
@COND_PLATFORM_MAC_1@ $(SETFILE) -t APPL nettest$(EXEEXT)
|
||||
@@ -89,10 +88,9 @@ COND_PLATFORM_OS2_1___nettest___os2_emxbindcmd = $(NM) nettest$(EXEEXT) | if \
|
||||
@COND_TOOLKIT_MSW@__RCDEFDIR_p_1 = --include-dir \
|
||||
@COND_TOOLKIT_MSW@ $(LIBDIRNAME)/wx/include/$(TOOLCHAIN_FULLNAME)
|
||||
@COND_PLATFORM_WIN32_1@__nettest___win32rc = nettest_sample_rc.o
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@__nettest_app_Contents_PkgInfo___depname \
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@ = nettest.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@__nettest_bundle___depname \
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@ = nettest_bundle
|
||||
@COND_PLATFORM_MACOSX_1@__nettest_app_Contents_PkgInfo___depname \
|
||||
@COND_PLATFORM_MACOSX_1@ = nettest.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@__nettest_bundle___depname = nettest_bundle
|
||||
@COND_TOOLKIT_MAC@____nettest_BUNDLE_TGT_REF_DEP = \
|
||||
@COND_TOOLKIT_MAC@ $(__nettest_app_Contents_PkgInfo___depname)
|
||||
@COND_TOOLKIT_OSX_CARBON@____nettest_BUNDLE_TGT_REF_DEP \
|
||||
@@ -134,7 +132,7 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
|
||||
|
||||
### Targets: ###
|
||||
|
||||
all: $(__nettest___depname) $(__nettest_bundle___depname)
|
||||
all: nettest$(EXEEXT) $(__nettest_bundle___depname)
|
||||
|
||||
install:
|
||||
|
||||
@@ -151,33 +149,33 @@ clean:
|
||||
distclean: clean
|
||||
rm -f config.cache config.log config.status bk-deps bk-make-pch shared-ld-sh Makefile
|
||||
|
||||
@COND_PLATFORM_MSDOS_0@nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc)
|
||||
@COND_PLATFORM_MSDOS_0@ $(CXX) -o $@ $(NETTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
|
||||
@COND_PLATFORM_MSDOS_0@
|
||||
@COND_PLATFORM_MSDOS_0@ $(__nettest___mac_setfilecmd)
|
||||
@COND_PLATFORM_MSDOS_0@ $(__nettest___os2_emxbindcmd)
|
||||
nettest$(EXEEXT): $(NETTEST_OBJECTS) $(__nettest___win32rc)
|
||||
$(CXX) -o $@ $(NETTEST_OBJECTS) -L$(LIBDIRNAME) $(LDFLAGS_GUI) $(SAMPLES_RPATH_FLAG) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_SCINTILLA_IF_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) $(EXTRALIBS_FOR_GUI) $(__LIB_ZLIB_p) $(__LIB_REGEX_p) $(__LIB_EXPAT_p) $(EXTRALIBS_FOR_BASE) $(LIBS)
|
||||
|
||||
$(__nettest___mac_setfilecmd)
|
||||
$(__nettest___os2_emxbindcmd)
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@nettest.app/Contents/PkgInfo: $(__nettest___depname) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@ mkdir -p nettest.app/Contents
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@ mkdir -p nettest.app/Contents/MacOS
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@ mkdir -p nettest.app/Contents/Resources
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@ -e "s/EXECUTABLE/nettest/" \
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@ -e "s/VERSION/$(WX_VERSION)/" \
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@ $(top_srcdir)/src/osx/carbon/Info.plist.in >nettest.app/Contents/Info.plist
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@ /bin/echo "APPL????" >nettest.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@ ln -f nettest$(EXEEXT) nettest.app/Contents/MacOS/nettest
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns nettest.app/Contents/Resources/wxmac.icns
|
||||
@COND_PLATFORM_MACOSX_1@nettest.app/Contents/PkgInfo: nettest$(EXEEXT) $(top_srcdir)/src/osx/carbon/Info.plist.in $(top_srcdir)/src/osx/carbon/wxmac.icns
|
||||
@COND_PLATFORM_MACOSX_1@ mkdir -p nettest.app/Contents
|
||||
@COND_PLATFORM_MACOSX_1@ mkdir -p nettest.app/Contents/MacOS
|
||||
@COND_PLATFORM_MACOSX_1@ mkdir -p nettest.app/Contents/Resources
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ sed -e "s/IDENTIFIER/`echo $(srcdir) | sed -e 's,\.\./,,g' | sed -e 's,/,.,g'`/" \
|
||||
@COND_PLATFORM_MACOSX_1@ -e "s/EXECUTABLE/nettest/" \
|
||||
@COND_PLATFORM_MACOSX_1@ -e "s/VERSION/$(WX_VERSION)/" \
|
||||
@COND_PLATFORM_MACOSX_1@ $(top_srcdir)/src/osx/carbon/Info.plist.in >nettest.app/Contents/Info.plist
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ /bin/echo "APPL????" >nettest.app/Contents/PkgInfo
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ ln -f nettest$(EXEEXT) nettest.app/Contents/MacOS/nettest
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@
|
||||
@COND_PLATFORM_MACOSX_1@ cp -f $(top_srcdir)/src/osx/carbon/wxmac.icns nettest.app/Contents/Resources/wxmac.icns
|
||||
|
||||
@COND_PLATFORM_MACOSX_1_PLATFORM_MSDOS_0@nettest_bundle: $(____nettest_BUNDLE_TGT_REF_DEP)
|
||||
@COND_PLATFORM_MACOSX_1@nettest_bundle: $(____nettest_BUNDLE_TGT_REF_DEP)
|
||||
|
||||
nettest_sample_rc.o: $(srcdir)/../../samples/sample.rc
|
||||
$(WINDRES) -i$< -o$@ --define __WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_2) $(__DEBUG_DEFINE_p_2) $(__EXCEPTIONS_DEFINE_p_2) $(__RTTI_DEFINE_p_2) $(__THREAD_DEFINE_p_2) --include-dir $(srcdir) $(__DLLFLAG_p_2) --include-dir $(srcdir)/../../samples $(__RCDEFDIR_p_1) --include-dir $(top_srcdir)/include
|
||||
|
@@ -4,8 +4,7 @@
|
||||
<include file="../../build/bakefiles/common_samples.bkl"/>
|
||||
|
||||
<exe id="nettest" template="wx_sample"
|
||||
template_append="wx_append"
|
||||
cond="PLATFORM_MSDOS=='0'">
|
||||
template_append="wx_append">
|
||||
<sources>nettest.cpp</sources>
|
||||
<wx-lib>core</wx-lib>
|
||||
<wx-lib>base</wx-lib>
|
||||
|
Reference in New Issue
Block a user