diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-17 23:00:00 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-08-17 23:08:50 +0300 |
| commit | a50103a7028254a2113c2e21b31cc372dfc77570 (patch) | |
| tree | ffe6d300a7e988cdc8ff269a0576418d7bdd2279 /cli_ure/source/native | |
| parent | 94fb4e55c8f83442e79c99515b8cdf33997f56c4 (diff) | |
Bin stuff for compiler versions we don't use
Diffstat (limited to 'cli_ure/source/native')
| -rw-r--r-- | cli_ure/source/native/makefile.mk | 30 |
1 files changed, 2 insertions, 28 deletions
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)" != "" |