AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

moved wxINSTALL_PREFIX from CPPFLAGS to setup.h

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11336 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2001-08-08 23:46:39 +00:00
parent 776862b497
commit 7e67ed0df4
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -17948,6 +17948,12 @@ EOF
cat >> confdefs.h <<EOF
#define wxINSTALL_PREFIX $prefix
EOF
GUILIBS="$GUI_TK_LIBRARY $TOOLKIT_LINK"
OPENGL_LIBS="$OPENGL_LINK"
@ -18093,7 +18099,7 @@ SAMPLES_SUBDIRS="`echo $SAMPLES_SUBDIRS | tr -s ' ' | tr ' ' '\n' | sort | uniq
echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
echo "configure:18097: checking whether ${MAKE-make} sets \${MAKE}" >&5
echo "configure:18103: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6

6
configure.in
View File

@ -4506,6 +4506,12 @@ fi
AC_DEFINE_UNQUOTED(WXWIN_OS_DESCRIPTION, $OSINFO)
dnl ---------------------------------------------------------------------------
dnl define the variable containing the installation prefix (used in dcpsg.cpp)
dnl ---------------------------------------------------------------------------
AC_DEFINE_UNQUOTED(wxINSTALL_PREFIX, $prefix)
dnl ---------------------------------------------------------------------------
dnl Output the makefiles and such from the results found above
dnl ---------------------------------------------------------------------------

3
setup.h.in
View File

@ -21,6 +21,9 @@
/* fill in with the string wxGetOsDescription() will return */
#undef WXWIN_OS_DESCRIPTION
/* the installation location prefix from configure */
#undef wxINSTALL_PREFIX
/* Define to `int' if <sys/types.h> doesn't define. */
#undef gid_t

10
src/make.env.in
View File

@ -13,7 +13,7 @@
# see comment near LDFLAGS at the end of file
EXTRALIBS = @LDFLAGS@ @EXTRA_LIBS@
OPENGLLIBS = @OPENGL_LIBS@
LDLIBS = $(APPEXTRALIBS) ${top_builddir}/lib/@WX_TARGET_LIBRARY@ $(EXTRALIBS)
LDLIBS = ${APPEXTRALIBS} ${top_builddir}/lib/@WX_TARGET_LIBRARY@ ${EXTRALIBS}
TOOLKIT = @TOOLKIT@
TOOLKITDIR = @TOOLKIT_DIR@
@ -21,8 +21,6 @@ TOOLKITDIR = @TOOLKIT_DIR@
WXLIB = @WX_LIBRARY_NAME_STATIC@
WXSHLIB = @WX_LIBRARY_NAME_SHARED@
EXTRADEFS="-DwxINSTALL_PREFIX=\"@prefix@\""
########################### VERSION #################################
WX_MAJOR_VERSION_NUMBER = @WX_MAJOR_VERSION_NUMBER@
@ -67,9 +65,9 @@ DLLTOOL = @DLLTOOL@
########################### Flags #################################
CPPFLAGS = $(APPEXTRACPPFLAGS) @CPPFLAGS@ @TOOLKIT_DEF@ @WXDEBUG_DEFINE@
CFLAGS = $(APPEXTRACFLAGS) $(CPPFLAGS) @CODE_GEN_FLAGS@ @CFLAGS@
CXXFLAGS = $(APPEXTRACXXFLAGS) $(CPPFLAGS) \
CPPFLAGS = ${APPEXTRACPPFLAGS} @CPPFLAGS@ @TOOLKIT_DEF@ @WXDEBUG_DEFINE@
CFLAGS = ${APPEXTRACFLAGS} ${CPPFLAGS} @CODE_GEN_FLAGS@ @CFLAGS@
CXXFLAGS = ${APPEXTRACXXFLAGS} ${CPPFLAGS} \
@CODE_GEN_FLAGS@ @CODE_GEN_FLAGS_CXX@ @CXXFLAGS@
PICFLAGS = @PIC_FLAG@