Kaydet (Commit) 2195299a authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Where to find ATL files doesn't depend on --enable-activex

...but, according to the 'Doesn't exist for VSE' comment, apparently rather on the
compiler version installed

Change-Id: I49a87fa55facee8ee66e2b44d7090d06fb104b89
üst c4688ad9
...@@ -12809,12 +12809,12 @@ AC_MSG_NOTICE([setting up the build environment variables...]) ...@@ -12809,12 +12809,12 @@ AC_MSG_NOTICE([setting up the build environment variables...])
AC_SUBST(COMPATH) AC_SUBST(COMPATH)
if test "$build_os" = "cygwin"; then if test "$build_os" = "cygwin"; then
if test "$DISABLE_ACTIVEX" = "TRUE"; then if test -d "$COMPATH/atlmfc/lib"; then
ATL_LIB="$WINDOWS_SDK_HOME/lib" # Doesn't exist for VSE
ATL_INCLUDE="$WINDOWS_SDK_HOME/include/atl"
else
ATL_LIB="$COMPATH/atlmfc/lib" ATL_LIB="$COMPATH/atlmfc/lib"
ATL_INCLUDE="$COMPATH/atlmfc/include" ATL_INCLUDE="$COMPATH/atlmfc/include"
else
ATL_LIB="$WINDOWS_SDK_HOME/lib" # Doesn't exist for VSE
ATL_INCLUDE="$WINDOWS_SDK_HOME/include/atl"
fi fi
if test "$BITNESS_OVERRIDE" = 64; then if test "$BITNESS_OVERRIDE" = 64; then
ATL_LIB="$ATL_LIB/amd64" ATL_LIB="$ATL_LIB/amd64"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment