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

attempt to fix GUI apps building on OS/2

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@23571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík 2003-09-13 20:23:44 +00:00
parent 2a87985348
commit 874d12cff7
3 changed files with 191 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
aclocal.m4 vendored
View File

@ -1613,13 +1613,9 @@ AC_DEFUN(AC_BAKEFILE_CHECK_BASIC_STUFF,
AC_PROG_MAKE_SET
AC_SUBST(MAKE_SET)
if test "$build" != "$host" ; then
AR=$host_alias-ar
STRIP=$host_alias-strip
else
AC_CHECK_PROG(AR, ar, ar, ar)
AC_CHECK_PROG(STRIP, strip, strip, true)
fi
AC_CHECK_TOOL(AR, ar, ar)
AC_CHECK_TOOL(STRIP, strip, :)
AC_CHECK_TOOL(NM, nm, :)
case ${host} in
*-hp-hpux* )

196
configure vendored
View File

File diff suppressed because one or more lines are too long

9
samples/minimal/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@
@ -92,6 +93,9 @@ COND_MONOLITHIC_1___WXLIB_MONO_p = \
@COND_PLATFORM_MAC_1@__minimal___mac_rezcmd = $(__MACOSX_RESOURCES_p_1)
@COND_PLATFORM_MAC_1@__minimal___mac_setfilecmd = \
@COND_PLATFORM_MAC_1@ $(SETFILE) -a C minimal$(EXEEXT)
COND_PLATFORM_OS2_1___minimal___os2_emxbindcmd = $(NM) minimal$(EXEEXT) | if \
grep -q pmwin.763 ; then emxbind -ep minimal$(EXEEXT) ; fi
@COND_PLATFORM_OS2_1@__minimal___os2_emxbindcmd = $(COND_PLATFORM_OS2_1___minimal___os2_emxbindcmd)
@COND_PLATFORM_WIN32_1@__minimal___win32rc = minimal_sample_rc.o
@COND_PLATFORM_MACOSX_1@__minimal_bundle___depname = minimal_bundle
@ -113,9 +117,10 @@ install: all
install-strip: install
minimal$(EXEEXT): $(MINIMAL_OBJECTS) $(__minimal___win32rc)
$(CXX) -o $@ $(MINIMAL_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) $(EXTRALIBS_GUI)
$(CXX) -o $@ $(MINIMAL_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) $(EXTRALIBS_GUI)
$(__minimal___mac_rezcmd)
$(__minimal___mac_setfilecmd)
$(__minimal___os2_emxbindcmd)
$(SAMPLES_RPATH_POSTLINK)
minimal.app/Contents/PkgInfo: minimal$(EXEEXT) $(top_srcdir)/src/mac/Info.plist.in $(LIBDIRNAME)/libwx_$(TOOLCHAIN_NAME).0.rsrc $(top_srcdir)/src/mac/wxmac.icns
@ -145,7 +150,7 @@ minimal_minimal.o: $(srcdir)/minimal.cpp
$(CXXC) -c -o $@ $(MINIMAL_CXXFLAGS) $<
minimal_sample_rc.o: $(srcdir)/../../samples/sample.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
uninstall: