diff options
| author | Miguel de Icaza <miguel@gnome.org> | 2016-06-14 23:57:09 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-14 23:57:09 +0300 |
| commit | aff1a51a389f09ca1865e54c16cfff4741435c8e (patch) | |
| tree | 53e628ad93f7ce1e25957e45561c381cfe926113 /mcs/class/System.Json.Microsoft | |
| parent | 6b3a592de0eb47d9d92ce3a012ac771319afb868 (diff) | |
WIP [library.make] Make resource usage declarative in the class libraries (#3159)
[library.make] Make resource usage declarative in the class libraries
Diffstat (limited to 'mcs/class/System.Json.Microsoft')
| -rw-r--r-- | mcs/class/System.Json.Microsoft/Makefile | 9 | ||||
| -rw-r--r-- | mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/mcs/class/System.Json.Microsoft/Makefile b/mcs/class/System.Json.Microsoft/Makefile index 2d13a176b82..56c51c6330d 100644 --- a/mcs/class/System.Json.Microsoft/Makefile +++ b/mcs/class/System.Json.Microsoft/Makefile @@ -2,14 +2,11 @@ thisdir = class/System.Json.Microsoft SUBDIRS = include ../../build/rules.make -System.Json/Properties/Resources.resources: System.Json/Properties/Resources.resx - $(RESGEN) "$<" "$@" +RESOURCE_DEFS = System.Json.Properties.Resources,System.Json/Properties/Resources.resx LIBRARY = System.Json.Microsoft.dll LIB_REFS = System System.Xml System.Core System.Runtime.Serialization -LIB_MCS_FLAGS = /d:ASPNETMVC -keyfile:../winfx.pub -delaysign \ - /resource:System.Json/Properties/Resources.resources,System.Json.Properties.Resources.resources - +LIB_MCS_FLAGS = /d:ASPNETMVC -keyfile:../winfx.pub -delaysign EXTRA_DISTFILES = System.Json/Properties/Resources.resx ifeq (4, $(FRAMEWORK_VERSION_MAJOR)) @@ -24,5 +21,3 @@ endif TEST_MCS_FLAGS = $(LIB_MCS_FLAGS) include ../../build/library.make - -$(the_lib): System.Json/Properties/Resources.resources diff --git a/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj b/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj index 1f7a48e137f..136d3cc0f0f 100644 --- a/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj +++ b/mcs/class/System.Json.Microsoft/System.Json.Microsoft-net_4_x.csproj @@ -83,10 +83,10 @@ -->
<PropertyGroup>
<PreBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> -cp $(ProjectDir)\System.Json\Properties\Resources.resx System.Json.Properties.Resources.resx + </PreBuildEvent>
<PreBuildEvent Condition=" '$(OS)' == 'Windows_NT' ">
-cp $(ProjectDir)\System.Json\Properties\Resources.resx System.Json.Properties.Resources.resx
+
</PreBuildEvent>
<PostBuildEvent Condition=" '$(OS)' != 'Windows_NT' "> |