Author: pfg Date: Thu Oct 4 20:16:05 2012 New Revision: 1394242 URL: http://svn.apache.org/viewvc?rev=1394242&view=rev Log: Drop support for some extremely old MS compilers
Modified: incubator/ooo/trunk/main/stlport/makefile.mk Modified: incubator/ooo/trunk/main/stlport/makefile.mk URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/stlport/makefile.mk?rev=1394242&r1=1394241&r2=1394242&view=diff ============================================================================== --- incubator/ooo/trunk/main/stlport/makefile.mk (original) +++ incubator/ooo/trunk/main/stlport/makefile.mk Thu Oct 4 20:16:05 2012 @@ -61,15 +61,9 @@ $(INCCOM)$/stlport$/vector: systemstl$/$ TARFILE_MD5=18f577b374d60b3c760a3a3350407632 PATCH_FILES=STLport-4.5.patch STLport-4.5-gcc43_warnings.patch .ELIF "$(GUI)"=="WNT" - .IF "$(CCNUMVER)"<="001300000000" - TARFILE_NAME=STLport-4.0 - TARFILE_MD5=c441926f3a552ed3e5b274b62e86af16 - PATCH_FILES=STLport-4.0.patch - .ELSE - TARFILE_NAME=STLport-4.5-0119 - TARFILE_MD5=7376930b0d3f3d77a685d94c4a3acda8 - PATCH_FILES=STLport-4.5-0119.patch - .ENDIF + TARFILE_NAME=STLport-4.5-0119 + TARFILE_MD5=7376930b0d3f3d77a685d94c4a3acda8 + PATCH_FILES=STLport-4.5-0119.patch .ELSE TARFILE_NAME=STLport-4.0 TARFILE_MD5=c441926f3a552ed3e5b274b62e86af16 @@ -109,11 +103,7 @@ BUILD_DIR=src .IF "$(COM)"=="MSC" BUILD_ACTION=nmake -.IF "$(CCNUMVER)"<="001400000000" -BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHsc" -.ELSE # "$(CCNUMVER)"<="001400000000" BUILD_FLAGS=-f vc7.mak EXFLAGS="/EHa /Zc:wchar_t-" CCNUMVER=$(CCNUMVER) -.ENDIF # "$(CCNUMVER)"<="001400000000" .ENDIF .IF "$(COM)"=="GCC" @@ -212,31 +202,4 @@ all: .INCLUDE : target.mk .INCLUDE : tg_ext.mk -.IF "$(GUI)"=="WNT" -.IF "$(COM)"!="GCC" -.IF "$(CCNUMVER)"<="001300000000" - -$(MISC)$/$(TARFILE_ROOTDIR) : avoid_win32_patches -avoid_win32_patches : - @$(ECHONL) - @echo ERROR! this module can't use automated patch creation - @echo on windows. - @$(ECHONL) - force_dmake_to_error - -$(PACKAGE_DIR)$/so_custom_patch : $(PACKAGE_DIR)$/$(PATCH_FLAG_FILE) - win32_custom.bat $(PACKAGE_DIR) $(BACK_PATH) && $(TOUCH) $@ - -$(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" - .ENDIF # "$(USE_SYSTEM_STL)"