diff options
| -rwxr-xr-x | agent/bin/mcc | 6 | ||||
| -rw-r--r-- | agent/bin/mcc-env | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/agent/bin/mcc b/agent/bin/mcc index a1c82d47..9f6fc85d 100755 --- a/agent/bin/mcc +++ b/agent/bin/mcc @@ -91,16 +91,16 @@ if [ ! -z "$oval" ] ; then fi if [ $gflag = 1 ] ; then - CFLAGS1="/D_DEBUG /Zi /MTd" + CFLAGS1="/Zi /MTd" else - CFLAGS1="/DNDEBUG /GF /Gy /FD /MT" + CFLAGS1="/GF /Gy /FD /MT" fi if [ $Oflag = 0 ] ; then CFLAGS2="/Od" else CFLAGS2="/O2 /Ob1" fi -CFLAGS3="/Oy- /DWIN32 /D_CONSOLE /D_VC80_UPGRADE=0x0600 /D_MBCS /W4" +CFLAGS3="/Oy- /W4 /DWIN32 /D_CONSOLE" if [ "$machine" == "x86_64" ] ; then export LIB=$(cygpath -aw "$VSHOME/VC/lib/amd64")\;$(cygpath -aw "$WINSDK/Lib/x64") diff --git a/agent/bin/mcc-env b/agent/bin/mcc-env index 952c050e..3c190ef3 100644 --- a/agent/bin/mcc-env +++ b/agent/bin/mcc-env @@ -85,13 +85,13 @@ if [ ! -d "$WINSDK" ] ; then exit 1 fi -export DevEnvDir=$(cygpath -aw "$VSHOME/Common7/IDE") -export WindowsSdkDir=$(cygpath -aw "$WINSDK/") -export VSINSTALLDIR=$(cygpath -aw "$VSHOME") -export VCINSTALLDIR=$(cygpath -aw "$VSHOME/VC") +export WindowsSdkDir=$(cygpath -am "$WINSDK/") +export VSINSTALLDIR=$(cygpath -am "$VSHOME") +export VCINSTALLDIR="$VSINSTALLDIR/VC" +export DevEnvDir="$VSINSTALLDIR/Common7/IDE" export FrameworkDir=Framework32 -export LIB=$(cygpath -aw "$VSHOME/VC/lib")\;$(cygpath -aw "$WINSDK/Lib") -export INCLUDE=$(cygpath -aw "$VSHOME/VC/include")\;$(cygpath -aw "$WINSDK/Include") +export LIB="$VSINSTALLDIR/VC/lib"\;"$WindowsSdkDir/Lib" +export INCLUDE="$VSINSTALLDIR/VC/include"\;"$WindowsSdkDir/Include" export PATH="$VSHOME/Common7/IDE:$VSHOME/VC/bin:$VSHOME/Common7/Tools:$VSHOME/VC/VCPackages:$PATH" unset MAKEFLAGS |