Bin stuff for compiler versions we don't use

3 files changed, 2 insertions, 57 deletions

diff --git a/cli_ure/source/climaker/makefile.mk b/cli_ure/source/climaker/makefile.mk
index b001a1545fae..3362c6a239af 100644
--- a/cli_ure/source/climaker/makefile.mk
+++ b/cli_ure/source/climaker/makefile.mk
@@ -80,11 +80,7 @@ CFLAGSCXX +=-AI$(BIN)
 
 # When compiling for CLR, disable "warning C4339: use of undefined type detected
 # in CLR meta-data - use of this type may lead to a runtime exception":
-.IF "$(COMEX)"=="10"
-CFLAGSCXX += -clr:noAssembly -wd4339
-.ELSE
 CFLAGSCXX += -clr:oldSyntax -LN -wd4339 -wd4715
-.ENDIF
 
 OBJFILES = \
     $(OBJ)$/climaker_app.obj	\
@@ -100,15 +96,11 @@ APP1STDLIBS = \
     $(SALLIB)			\
     mscoree.lib
 
-.IF "$(CCNUMVER)" >= "001399999999"
 APP1STDLIBS += \
     msvcmrt.lib
-.ENDIF
 
 .ENDIF
 
-
-
 .INCLUDE : $(PRJ)$/util$/target.pmk
 .INCLUDE :  target.mk
 
@@ -116,22 +108,14 @@ CLIMAKER_CONFIG = $(BIN)$/climaker.exe.config
 
 ALLTAR: \
     $(CLIMAKER_CONFIG)
-    
-
 
 #Create the config file that is used with the policy assembly
 $(CLIMAKER_CONFIG): climaker.exe.config
     $(COPY) $< $@
     chmod +x $@
 
-
 .IF "$(BUILD_FOR_CLI)" != ""
 
 $(OBJFILES): $(BIN)$/cli_basetypes.dll
 
-
 .ENDIF
-
-
-
-
diff --git a/cli_ure/source/native/makefile.mk b/cli_ure/source/native/makefile.mk
index d0b87e6f6817..e912bffdef05 100644
--- a/cli_ure/source/native/makefile.mk
+++ b/cli_ure/source/native/makefile.mk
@@ -79,19 +79,13 @@ UNOTYPES = \
 #loader lock was solved as of VS 2005 (CCNUMVER = 0014..)
 # When compiling for CLR, disable "warning C4339: use of undefined type detected
 # in CLR meta-data - use of this type may lead to a runtime exception":
-.IF "$(CCNUMVER)" >= "001399999999"
 CFLAGSCXX += -clr:oldSyntax -AI $(BIN) -wd4339
-.ELSE
-CFLAGSCXX += -clr -AI $(BIN) -wd4339
-#see  Microsoft Knowledge Base Article - 814472
-LINKFLAGS += -NOENTRY -NODEFAULTLIB:nochkclr.obj -INCLUDE:__DllMainCRTStartup@12
-.ENDIF
 
 SLOFILES = \
     $(SLO)$/native_bootstrap.obj \
     $(SLO)$/path.obj \
     $(SLO)$/assembly_cppuhelper.obj
-    
+
 
 SHL1OBJS = $(SLOFILES)
 
@@ -106,10 +100,8 @@ SHL1STDLIBS = \
     mscoree.lib \
     Advapi32.lib
 
-.IF "$(CCNUMVER)" >= "001399999999"
 SHL1STDLIBS += \
     msvcmrt.lib
-.ENDIF
 
 SHL1VERSIONMAP = msvc.map
 
@@ -127,10 +119,7 @@ ALLTAR: \
     $(SIGN)
 
 
-
-.IF "$(CCNUMVER)" >= "001399999999"
 CFLAGSCXX += -clr:oldSyntax
-.ENDIF
 
 $(ASSEMBLY_ATTRIBUTES) : assembly.cxx $(BIN)$/cliuno.snk $(BIN)$/cliureversion.mk
     @echo $(ASSEMBLY_KEY_X)
@@ -141,20 +130,14 @@ $(ASSEMBLY_ATTRIBUTES) : assembly.cxx $(BIN)$/cliuno.snk $(BIN)$/cliureversion.m
     echo \
     '[assembly:System::Reflection::AssemblyKeyFile($(ASSEMBLY_KEY_X))];' \
     >> $(OUT)$/misc$/assembly_cppuhelper.cxx
-    
-    
 
 #make sure we build cli_cppuhelper after the version changed
 $(SHL1OBJS) : $(BIN)$/cli_cppuhelper.config
 
-    
-
 $(SIGN): $(SHL1TARGETN)
     $(WRAPCMD) sn.exe -R $(BIN)$/$(TARGET).dll	$(BIN)$/cliuno.snk	 && $(TOUCH) $@
 
 #do not forget to deliver cli_cppuhelper.config. It is NOT embedded in the policy file.
-.IF "$(CCNUMVER)" >= "001399999999"		
-#.NET 2 and higher	
 # If the x86 switch is ommitted then the system assumes the assembly to be MSIL.
 # The policy file is still found when an application tries to load an older
 # cli_cppuhelper.dll but the system cannot locate it. It possibly assumes that the
@@ -165,19 +148,10 @@ $(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_cppuhelper.config
             -keyfile:$(BIN)$/cliuno.snk \
             -link:$(BIN)$/cli_cppuhelper.config \
             -platform:x86
-.ELSE
-#.NET 1.1: platform flag not needed
-$(POLICY_ASSEMBLY_FILE) : $(BIN)$/cli_cppuhelper.config
-    $(WRAPCMD) AL.exe -out:$@ \
-            -version:$(CLI_CPPUHELPER_POLICY_VERSION) \
-            -keyfile:$(BIN)$/cliuno.snk \
-            -link:$(BIN)$/cli_cppuhelper.config		
-.ENDIF			
 
 #Create the config file that is used with the policy assembly
 $(BIN)$/cli_cppuhelper.config: cli_cppuhelper_config $(BIN)$/cliureversion.mk 
     $(PERL) $(SOLARENV)$/bin$/clipatchconfig.pl \
     $< $@
-    
-.ENDIF			# "$(BUILD_FOR_CLI)" != ""
 
+.ENDIF			# "$(BUILD_FOR_CLI)" != ""
diff --git a/cli_ure/source/uno_bridge/makefile.mk b/cli_ure/source/uno_bridge/makefile.mk
index b7682aed4b1b..459d32b7f035 100644
--- a/cli_ure/source/uno_bridge/makefile.mk
+++ b/cli_ure/source/uno_bridge/makefile.mk
@@ -38,26 +38,15 @@ USE_DEFFILE = TRUE
 .INCLUDE :  settings.mk
 .INCLUDE : $(PRJ)$/util$/makefile.pmk
 
-
 .IF "$(COM)" == "MSC"
 # When compiling for CLR, disable "warning C4339: use of undefined type detected
 # in CLR meta-data - use of this type may lead to a runtime exception":
-.IF "$(CCNUMVER)" <= "001399999999"
-CFLAGSCXX += -clr -AI $(DLLDEST) -AI $(SOLARBINDIR) -wd4339
-.ELSE
 CFLAGSCXX += -clr:oldSyntax -AI $(DLLDEST) -AI $(SOLARBINDIR) -wd4339
-.ENDIF
 
 .IF "$(debug)" != ""
 CFLAGS += -Ob0
 .ENDIF
 
-
-
-.IF "$(CCNUMVER)" <= "001399999999"
-#see  Microsoft Knowledge Base Article - 814472
-LINKFLAGS += -NOENTRY -NODEFAULTLIB:nochkclr.obj -INCLUDE:__DllMainCRTStartup@12
-.ENDIF
 # --- Files --------------------------------------------------------
 
 SLOFILES = \
@@ -76,10 +65,8 @@ SHL1STDLIBS = \
     $(SALLIB)			\
     mscoree.lib
 
-.IF "$(CCNUMVER)" >= "001399999999"
 SHL1STDLIBS += \
     msvcmrt.lib
-.ENDIF
 
 SHL1VERSIONMAP = bridge_exports.map