You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by mt...@apache.org on 2009/08/17 14:57:57 UTC
svn commit: r804959 - in /commons/sandbox/runtime/trunk/src/main/native:
Makefile.msc.in configure
Author: mturk
Date: Mon Aug 17 12:57:57 2009
New Revision: 804959
URL: http://svn.apache.org/viewvc?rev=804959&view=rev
Log:
Add assembler flags configure
Modified:
commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
commons/sandbox/runtime/trunk/src/main/native/configure
Modified: commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in?rev=804959&r1=804958&r2=804959&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in (original)
+++ commons/sandbox/runtime/trunk/src/main/native/Makefile.msc.in Mon Aug 17 12:57:57 2009
@@ -38,6 +38,7 @@
TOPDIR=@topdir@
CPP=@cpp@
CXX=@cxx@
+AFLAGS=@asflags@
CFLAGS=@ccflags@
CPPFLAGS=@cppopts@
CXXFLAGS=@cxxopts@
Modified: commons/sandbox/runtime/trunk/src/main/native/configure
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/configure?rev=804959&r1=804958&r2=804959&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/configure (original)
+++ commons/sandbox/runtime/trunk/src/main/native/configure Mon Aug 17 12:57:57 2009
@@ -64,6 +64,7 @@
topdir="${TOPDIR:=`dirname $0`}"
cpp="${CPP:=$cc -E}"
ccflags="$CFLAGS"
+asflags="$AFLAGS"
cppopts="$CPPFLAGS"
cxxopts="$CXXFLAGS"
ldflags="$LDFLAGS"
@@ -439,6 +440,7 @@
test ".$java_pinc" = . && java_pinc=hp-ux
;;
windows-cl )
+ varadds asflags -nologo -DWIN32 -DWINNT -D_WIN32
varadds ccflags -nologo -O2 -Ob2 -Oy- -Zi -D_MD -MD -W3
varadds cppopts -DWIN32 -DWINNT -D_WIN32 -D_WINDOWS -D_WINNT
varadds cppopts -D_WIN32_WINNT=0x0501 -D_WIN32_IE=0x0600
@@ -485,6 +487,7 @@
if [ ${cc_ver_major}0 -gt 130 ]; then
# Visual Studio 2005 and later
varadds ccflags "-GS-"
+ varadds shflags "/NXCOMPAT /DYNAMICBASE"
fi
fi
;;
@@ -496,6 +499,7 @@
varadds shflags +DD64
;;
windows-cl )
+ varadds asflags -coff -Cx -Zm -Di386 -DQUIET -D?QUIET
varadds ccflags -D_X86_=1
varadds shflags /MACHINE:X86
varadds arflags /MACHINE:X86
@@ -921,6 +925,7 @@
-e 's|@prefix@|'"$prefix"'|g' \
-e 's|@libdir@|'"$libdir"'|g' \
-e 's|@topdir@|'"$topdir"'|g' \
+ -e 's|@asflags@|'"$asflags"'|g' \
-e 's|@ccflags@|'"$ccflags"'|g' \
-e 's|@exflags@|'"$exflags"'|g' \
-e 's|@cppopts@|'"$cppopts"'|g' \