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

On 'make clean' don't remove the resource file on OS/2

Browse Source 
(It's shared between all apps!).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@25671 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Neis
2004-02-08 22:51:05 +00:00
parent 3b8675dd43
commit ddec88573d
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.in
View File

@@ -1373,6 +1373,7 @@ case "${host}" in
else else
dnl Include resources for the "native" port (wxPM). dnl Include resources for the "native" port (wxPM).
RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res" RESPROGRAMOBJ="\${top_srcdir}/include/wx/os2/wx.res"
CLEANRESPROGRAMOBJ=""
fi fi
AC_CACHE_CHECK([for gcc 3 or later], wx_cv_gcc3,[ AC_CACHE_CHECK([for gcc 3 or later], wx_cv_gcc3,[
AC_TRY_COMPILE([], AC_TRY_COMPILE([],
@@ -2050,6 +2051,7 @@ if test "$USE_WIN32" = 1 ; then
RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__" RESFLAGS="--include-dir \$(top_srcdir)/include --include-dir \$(top_srcdir)/\$(program_dir) --define __WIN32__ --define __WIN95__ --define __GNUWIN32__"
RESPROGRAMOBJ="\$(PROGRAM)_resources.o" RESPROGRAMOBJ="\$(PROGRAM)_resources.o"
CLEANRESPROGRAMOBJ=${RESPROGRAMOBJ}
dnl install Win32-specific files in "make install" dnl install Win32-specific files in "make install"
WIN32INSTALL=win32install WIN32INSTALL=win32install
@@ -5515,6 +5517,7 @@ dnl additional resurces settings
AC_SUBST(RESCOMP) AC_SUBST(RESCOMP)
AC_SUBST(RESFLAGS) AC_SUBST(RESFLAGS)
AC_SUBST(RESPROGRAMOBJ) AC_SUBST(RESPROGRAMOBJ)
AC_SUBST(CLEANRESPROGRAMOBJ)
AC_SUBST(WX_RESOURCES_MACOSX_ASCII) AC_SUBST(WX_RESOURCES_MACOSX_ASCII)
AC_SUBST(WX_RESOURCES_MACOSX_DATA) AC_SUBST(WX_RESOURCES_MACOSX_DATA)

3
src/makeprog.env.in
View File

@@ -4,6 +4,7 @@
PROGRAM_EXT = @PROGRAM_EXT@ PROGRAM_EXT = @PROGRAM_EXT@
BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT) BIN_PROGRAM = $(PROGRAM)$(PROGRAM_EXT)
RES_PROGRAM_OBJ = @RESPROGRAMOBJ@ RES_PROGRAM_OBJ = @RESPROGRAMOBJ@
CLEAN_RES_PROGRAM_OBJ = @CLEANRESPROGRAMOBJ@
BUNDLE = $(BIN_PROGRAM).app/Contents BUNDLE = $(BIN_PROGRAM).app/Contents
# NB: see remark in Makefile.in as to why we don't use %.foo: %.bar rules # NB: see remark in Makefile.in as to why we don't use %.foo: %.bar rules
@@ -49,7 +50,7 @@ install_data:
done done
clean: clean:
rm -f $(OBJECTS) $(DEPFILES) $(BIN_PROGRAM) $(RES_PROGRAM_OBJ) core rm -f $(OBJECTS) $(DEPFILES) $(BIN_PROGRAM) $(CLEAN_RES_PROGRAM_OBJ) core
# #
# Targets to build a Mac OS X application bundle # Targets to build a Mac OS X application bundle