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

make --static flag act on --cppflags too.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12365 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ron Lee
2001-11-09 05:24:36 +00:00
parent 57964555cd
commit 00c813596e
4 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure vendored
View File

@@ -11910,7 +11910,7 @@ echo "$ac_t""$wx_cv_prog_icc" 1>&6
WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a" WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o" SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1" TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1"
PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1" PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
@@ -18402,10 +18402,11 @@ 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 $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
echo "configure:18409: checking whether ${MAKE-make} sets \${MAKE}" >&5 echo "configure:18410: checking whether ${MAKE-make} sets \${MAKE}" >&5
set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` 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 if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6 echo $ac_n "(cached) $ac_c" 1>&6
@@ -18664,6 +18665,7 @@ s%@TOOLKIT_DIR@%$TOOLKIT_DIR%g
s%@TOOLKIT_VPATH@%$TOOLKIT_VPATH%g s%@TOOLKIT_VPATH@%$TOOLKIT_VPATH%g
s%@TOOLCHAIN_NAME@%$TOOLCHAIN_NAME%g s%@TOOLCHAIN_NAME@%$TOOLCHAIN_NAME%g
s%@TOOLCHAIN_DEFS@%$TOOLCHAIN_DEFS%g s%@TOOLCHAIN_DEFS@%$TOOLCHAIN_DEFS%g
s%@TOOLCHAIN_DLL_DEFS@%$TOOLCHAIN_DLL_DEFS%g
s%@cross_compiling@%$cross_compiling%g s%@cross_compiling@%$cross_compiling%g
s%@WXCONFIG_LIBS@%$WXCONFIG_LIBS%g s%@WXCONFIG_LIBS@%$WXCONFIG_LIBS%g
s%@WXCONFIG_LIBS_GL@%$WXCONFIG_LIBS_GL%g s%@WXCONFIG_LIBS_GL@%$WXCONFIG_LIBS_GL%g

3
configure.in
View File

@@ -2525,7 +2525,7 @@ if test "$wxUSE_SHARED" = "yes"; then
WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a" WX_LIBRARY_IMPORTLIB="${WX_LIBRARY_NAME_SHARED}.a"
SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o" SHARED_LD="${CXX} -shared -Wl,--out-implib,lib/${WX_LIBRARY_IMPORTLIB} -o"
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -DWXUSINGDLL=1" TOOLCHAIN_DLL_DEFS="${TOOLCHAIN_DLL_DEFS} -DWXUSINGDLL=1"
PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1" PIC_FLAG="-UWXUSINGDLL -DWXMAKINGDLL=1 -D_DLL=1 -D_WINDLL=1"
@@ -4746,6 +4746,7 @@ AC_SUBST(TOOLKIT_DIR)
AC_SUBST(TOOLKIT_VPATH) AC_SUBST(TOOLKIT_VPATH)
AC_SUBST(TOOLCHAIN_NAME) AC_SUBST(TOOLCHAIN_NAME)
AC_SUBST(TOOLCHAIN_DEFS) AC_SUBST(TOOLCHAIN_DEFS)
AC_SUBST(TOOLCHAIN_DLL_DEFS)
dnl wx-config options dnl wx-config options
AC_SUBST(host_alias) AC_SUBST(host_alias)

2
src/make.env.in
View File

@@ -60,7 +60,7 @@ DLLTOOL = @DLLTOOL@
########################### Flags ################################# ########################### Flags #################################
CPPFLAGS = ${APPEXTRACPPFLAGS} @CPPFLAGS@ @TOOLCHAIN_DEFS@ @WXDEBUG_DEFINE@ CPPFLAGS = ${APPEXTRACPPFLAGS} @CPPFLAGS@ @TOOLCHAIN_DEFS@@TOOLCHAIN_DLL_DEFS@ @WXDEBUG_DEFINE@
CFLAGS = ${APPEXTRACFLAGS} ${CPPFLAGS} @CODE_GEN_FLAGS@ @CFLAGS@ CFLAGS = ${APPEXTRACFLAGS} ${CPPFLAGS} @CODE_GEN_FLAGS@ @CFLAGS@
CXXFLAGS = ${APPEXTRACXXFLAGS} ${CPPFLAGS}@CODE_GEN_FLAGS@@CODE_GEN_FLAGS_CXX@ @CXXFLAGS@ CXXFLAGS = ${APPEXTRACXXFLAGS} ${CPPFLAGS}@CODE_GEN_FLAGS@@CODE_GEN_FLAGS_CXX@ @CXXFLAGS@
PICFLAGS = @PIC_FLAG@ PICFLAGS = @PIC_FLAG@

6
wx-config.in
View File

@@ -36,8 +36,14 @@ cppflags()
then then
includes=-I@includedir@ includes=-I@includedir@
fi fi
includes="-I@libdir@/wx/include/@TOOLCHAIN_NAME@ $includes" includes="-I@libdir@/wx/include/@TOOLCHAIN_NAME@ $includes"
if test $static_flag = yes ; then
echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @WXCONFIG_INCLUDE@ echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @WXCONFIG_INCLUDE@
else
echo $includes @WXDEBUG_DEFINE@ @TOOLCHAIN_DEFS@ @TOOLCHAIN_DLL_DEFS@ @WXCONFIG_INCLUDE@
fi
} }
if test $# -eq 0; then if test $# -eq 0; then