diff options
| author | Tor Lillqvist <tml@iki.fi> | 2011-05-14 23:26:26 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-05-14 23:26:26 +0300 |
| commit | 4c7f6926826019401b3a3d52eb34efcb4e21e1f9 (patch) | |
| tree | 90a2ebeab06186957877dfe42c5a9d9aaacbee4e | |
| parent | a84c47186dee0ca1fd52e6806728acfb8e0ec309 (diff) | |
Kill USE_NEW_SDK and adapt to it being always TRUE
| -rwxr-xr-x | set_soenv.in | 4 | ||||
| -rw-r--r-- | stlport/makefile.mk | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/set_soenv.in b/set_soenv.in index 9e039a1c65e0..8ef87fff1590 100755 --- a/set_soenv.in +++ b/set_soenv.in @@ -81,7 +81,7 @@ my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL, $MSPDB_PATH, $MIDL_PATH, $CSC_PATH, $PATH, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARLIB, $JAVALIB, $SOLARINC, $LOCALINI, $FRAMEWORKSHOME, $COMEX, $PERL, - $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $USE_NEW_SDK, $DOTNET_FRAMEWORK_HOME, + $COMP_ENV, $ILIB, $JAVAHOME, $PSDK_HOME, $DIRECTXSDK_LIB, $DOTNET_FRAMEWORK_HOME, $USE_DIRECTX5, $ATL_LIB, $ATL_INCLUDE, $MFC_LIB, $MFC_INCLUDE, $TMPDIR, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS, $WIN_GNUCOPY, $WIN_TOUCH, $MOZILLA_VERSION, $MOZILLA_TOOLKIT, $PREBUILD_MOZAB, $MOZILLABUILD, @@ -637,7 +637,6 @@ elsif ( $platform =~ m/cygwin/ ) $DIRECTXSDK_LIB = PathFormat('@DIRECTXSDK_LIB@'); $USE_DIRECTX5 = ""; $DOTNET_FRAMEWORK_HOME = PathFormat('@DOTNET_FRAMEWORK_HOME@'); - $USE_NEW_SDK = "TRUE"; $CPUNAME = "INTEL"; $CPUNAME = "X86_64" if $CL_X64; $CPU = "I"; @@ -1644,7 +1643,6 @@ if ( $platform =~ m/cygwin/ ) ToFile( "NSIS_PATH", $NSIS_PATH, "e" ); ToFile( "DISABLE_ACTIVEX", "@DISABLE_ACTIVEX@","e" ); ToFile( "DISABLE_ATL", "@DISABLE_ATL@","e" ); - ToFile( "USE_NEW_SDK", $USE_NEW_SDK, "e" ); # Variables used when building the parts that needs to be available # also as 64-bit versions in a 32-bit LibreOffice build, like # the Explorer extension. If the configure script hasn't diff --git a/stlport/makefile.mk b/stlport/makefile.mk index 3c74d229662f..2d3c6b5de39d 100644 --- a/stlport/makefile.mk +++ b/stlport/makefile.mk @@ -209,12 +209,10 @@ $(PACKAGE_DIR)$/so_custom_patch : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/so_custom_patch -.IF "$(USE_NEW_SDK)"!="" $(PACKAGE_DIR)$/win32_sdk_patch : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) win32_sdk.bat $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@ $(PACKAGE_DIR)$/$(CONFIGURE_FLAG_FILE) : $(PACKAGE_DIR)$/win32_sdk_patch -.ENDIF # "$(USE_NEW_SDK)"!="" .ENDIF # COMVER<=001300000000 .ENDIF "$(COM)"=="GCC" .ENDIF # "$(GUI)"=="WNT" |