diff options
author | Zoltan Varga <vargaz@gmail.com> | 2017-08-08 00:14:31 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-08 00:14:31 +0300 |
commit | 9be68f8952ea0e1aad582bfe2f47bad71aee2cc7 (patch) | |
tree | 8c7932022db02e6d608659232362663571979c52 /msvc | |
parent | f1ff42789be45c30cf3537ee986529179870df1e (diff) |
[runtime] Move eglib into mono/eglib so it becomes a convenience library similar to utils/ etc. (#5297)
Diffstat (limited to 'msvc')
-rw-r--r-- | msvc/eglib-common.targets | 50 | ||||
-rw-r--r-- | msvc/eglib-common.targets.filters | 48 | ||||
-rw-r--r-- | msvc/eglib-posix.targets | 4 | ||||
-rw-r--r-- | msvc/eglib-posix.targets.filters | 2 | ||||
-rw-r--r-- | msvc/eglib-win32.targets | 20 | ||||
-rw-r--r-- | msvc/eglib-win32.targets.filters | 18 | ||||
-rw-r--r-- | msvc/eglib.vcxproj | 10 | ||||
-rw-r--r-- | msvc/mono.props | 6 | ||||
-rw-r--r-- | msvc/test_eglib.vcxproj | 66 | ||||
-rw-r--r-- | msvc/test_eglib.vcxproj.filters | 58 | ||||
-rwxr-xr-x | msvc/winsetup.bat | 11 |
11 files changed, 141 insertions, 152 deletions
diff --git a/msvc/eglib-common.targets b/msvc/eglib-common.targets index 0b72e5a97e9..fa566976672 100644 --- a/msvc/eglib-common.targets +++ b/msvc/eglib-common.targets @@ -1,31 +1,31 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\garray.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gbytearray.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gerror.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gfile.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\ghashtable.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\giconv.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\glist.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmarkup.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmem.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\goutput.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gpattern.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gptrarray.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gqsort.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gqueue.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gshell.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gslist.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gspawn.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gstr.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gstring.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gunicode.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gutf8.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\garray.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gbytearray.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gerror.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\ghashtable.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\giconv.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\glist.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmarkup.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmem.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\goutput.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gpattern.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gptrarray.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gqsort.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gqueue.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gshell.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gslist.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gspawn.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gstr.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gstring.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gunicode.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gutf8.c" /> </ItemGroup> <ItemGroup> - <ClInclude Include="$(MonoSourceLocation)\eglib\src\glib.h" /> - <ClInclude Include="$(MonoSourceLocation)\eglib\src\gmodule.h" /> - <ClInclude Include="$(MonoSourceLocation)\eglib\src\sort.frag.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\eglib\glib.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\eglib\sort.frag.h" /> </ItemGroup> </Project> diff --git a/msvc/eglib-common.targets.filters b/msvc/eglib-common.targets.filters index 92996f7e592..dcd4a5942fb 100644 --- a/msvc/eglib-common.targets.filters +++ b/msvc/eglib-common.targets.filters @@ -1,78 +1,78 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\garray.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\garray.c"> <Filter>Source Files\Common</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gbytearray.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gbytearray.c"> <Filter>Source Files\Common</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gfile.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile.c"> <Filter>Source Files\Common</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gerror.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gerror.c"> <Filter>Source Files\Common</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\ghashtable.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\ghashtable.c"> <Filter>Source Files\Common</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\giconv.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\giconv.c"> <Filter>Source Files\Common</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\glist.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\glist.c"> <Filter>Source Files\Common</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmarkup.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmarkup.c"> <Filter>Source Files\Common</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmem.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmem.c"> <Filter>Source Files\Common</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\goutput.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\goutput.c"> <Filter>Source Files\Common</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gpattern.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gpattern.c"> <Filter>Source Files\Common</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gptrarray.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gptrarray.c"> <Filter>Source Files\Common</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gqsort.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gqsort.c"> <Filter>Source Files\Common</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gqueue.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gqueue.c"> <Filter>Source Files\Common</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gshell.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gshell.c"> <Filter>Source Files\Common</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gslist.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gslist.c"> <Filter>Source Files\Common</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gspawn.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gspawn.c"> <Filter>Source Files\Common</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gstr.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gstr.c"> <Filter>Source Files\Common</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gstring.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gstring.c"> <Filter>Source Files\Common</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gunicode.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gunicode.c"> <Filter>Source Files\Common</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gutf8.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gutf8.c"> <Filter>Source Files\Common</Filter> </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="$(MonoSourceLocation)\eglib\src\glib.h"> + <ClInclude Include="$(MonoSourceLocation)\mono\eglib\glib.h"> <Filter>Header Files\Common</Filter> </ClInclude> - <ClInclude Include="$(MonoSourceLocation)\eglib\src\gmodule.h"> + <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule.h"> <Filter>Header Files\Common</Filter> </ClInclude> - <ClInclude Include="$(MonoSourceLocation)\eglib\src\sort.frag.h"> + <ClInclude Include="$(MonoSourceLocation)\mono\eglib\sort.frag.h"> <Filter>Header Files\Common</Filter> </ClInclude> </ItemGroup> diff --git a/msvc/eglib-posix.targets b/msvc/eglib-posix.targets index ab3165e3e8c..8e5d3fa5925 100644 --- a/msvc/eglib-posix.targets +++ b/msvc/eglib-posix.targets @@ -1,6 +1,6 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gfile-posix.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile-posix.c" /> </ItemGroup> </Project> diff --git a/msvc/eglib-posix.targets.filters b/msvc/eglib-posix.targets.filters index a714ed87812..76265435b14 100644 --- a/msvc/eglib-posix.targets.filters +++ b/msvc/eglib-posix.targets.filters @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gfile-posix.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile-posix.c"> <Filter>Source Files\Posix</Filter> </ClCompile> </ItemGroup> diff --git a/msvc/eglib-win32.targets b/msvc/eglib-win32.targets index b95abe37f8c..572c50626f9 100644 --- a/msvc/eglib-win32.targets +++ b/msvc/eglib-win32.targets @@ -1,16 +1,16 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gdate-win32.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gdir-win32.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gfile-win32.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmisc-win32.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmodule-win32.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gpath.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gtimer-win32.c" /> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gunicode-win32.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gdate-win32.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gdir-win32.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile-win32.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmisc-win32.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmodule-win32.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gpath.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gtimer-win32.c" /> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gunicode-win32.c" /> </ItemGroup> <ItemGroup> - <ClInclude Include="$(MonoSourceLocation)\eglib\src\gmodule-win32-internals.h" /> + <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule-win32-internals.h" /> </ItemGroup> </Project> diff --git a/msvc/eglib-win32.targets.filters b/msvc/eglib-win32.targets.filters index 69939794efa..a1ed81ba268 100644 --- a/msvc/eglib-win32.targets.filters +++ b/msvc/eglib-win32.targets.filters @@ -1,33 +1,33 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gdate-win32.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gdate-win32.c"> <Filter>Source Files\Win32</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gdir-win32.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gdir-win32.c"> <Filter>Source Files\Win32</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gfile-win32.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gfile-win32.c"> <Filter>Source Files\Win32</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmisc-win32.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmisc-win32.c"> <Filter>Source Files\Win32</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gmodule-win32.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gmodule-win32.c"> <Filter>Source Files\Win32</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gpath.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gpath.c"> <Filter>Source Files\Win32</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gtimer-win32.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gtimer-win32.c"> <Filter>Source Files\Win32</Filter> </ClCompile> - <ClCompile Include="$(MonoSourceLocation)\eglib\src\gunicode-win32.c"> + <ClCompile Include="$(MonoSourceLocation)\mono\eglib\gunicode-win32.c"> <Filter>Source Files\Win32</Filter> </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="$(MonoSourceLocation)\eglib\src\gmodule-win32-internals.h"> + <ClInclude Include="$(MonoSourceLocation)\mono\eglib\gmodule-win32-internals.h"> <Filter>Header Files\Win32</Filter> </ClInclude> </ItemGroup> diff --git a/msvc/eglib.vcxproj b/msvc/eglib.vcxproj index 5e482d86b45..e4f706775c3 100644 --- a/msvc/eglib.vcxproj +++ b/msvc/eglib.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -83,7 +83,7 @@ </PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
@@ -101,7 +101,7 @@ </PreBuildEvent>
<ClCompile>
<Optimization>MinSpace</Optimization>
- <AdditionalIncludeDirectories>$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
@@ -120,7 +120,7 @@ </Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<PrecompiledHeader>
@@ -141,7 +141,7 @@ </Midl>
<ClCompile>
<Optimization>MinSpace</Optimization>
- <AdditionalIncludeDirectories>$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_SOURCE_DIR);$(MONO_EGLIB_INCLUDE_DIR);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level4</WarningLevel>
diff --git a/msvc/mono.props b/msvc/mono.props index 4ef38268b18..5b77ed2c275 100644 --- a/msvc/mono.props +++ b/msvc/mono.props @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup Label="UserMacros"> <!-- Change this to custom build tree location to enable out of source tree builds, example c:/mono-build/ --> @@ -21,8 +21,8 @@ <top_srcdir>$(MSBuildProjectDirectory)/$(MonoSourceLocation)</top_srcdir> <MONO_DIR>$(top_srcdir)</MONO_DIR> <MONO_INCLUDE_DIR>$(MONO_DIR)/mono</MONO_INCLUDE_DIR> - <MONO_EGLIB_INCLUDE_DIR>$(MONO_DIR)/eglib;$(MONO_DIR)/eglib/include;$(MONO_DIR)/eglib/test</MONO_EGLIB_INCLUDE_DIR> - <MONO_EGLIB_SOURCE_DIR>$(MONO_DIR)/eglib/src</MONO_EGLIB_SOURCE_DIR> + <MONO_EGLIB_INCLUDE_DIR>$(MONO_DIR)/mono/eglib</MONO_EGLIB_INCLUDE_DIR> + <MONO_EGLIB_SOURCE_DIR>$(MONO_DIR)/mono/eglib</MONO_EGLIB_SOURCE_DIR> <MONO_LIBGC_INCLUDE_DIR>$(MONO_DIR)/libgc/include</MONO_LIBGC_INCLUDE_DIR> <MONO_LIBGC_SOURCE_DIR>$(MONO_DIR)/libgc/src</MONO_LIBGC_SOURCE_DIR> <MONO_JIT_INCLUDE_DIR>$(MONO_INCLUDE_DIR)/jit</MONO_JIT_INCLUDE_DIR> diff --git a/msvc/test_eglib.vcxproj b/msvc/test_eglib.vcxproj index d5e0fc41cd5..826b9b62633 100644 --- a/msvc/test_eglib.vcxproj +++ b/msvc/test_eglib.vcxproj @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -85,7 +85,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -112,7 +112,7 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<Optimization>MinSpace</Optimization>
- <AdditionalIncludeDirectories>$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -137,7 +137,7 @@ </Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -165,7 +165,7 @@ </Midl>
<ClCompile>
<Optimization>MinSpace</Optimization>
- <AdditionalIncludeDirectories>$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(MONO_DIR);$(MONO_EGLIB_INCLUDE_DIR);$(MONO_EGLIB_SOURCE_DIR)%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;LIBTEST_EGLIB_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -183,40 +183,40 @@ </Link>
</ItemDefinitionGroup>
<ItemGroup>
- <ClCompile Include="..\eglib\test\array.c" />
- <ClCompile Include="..\eglib\test\dir.c" />
- <ClCompile Include="..\eglib\test\driver.c" />
- <ClCompile Include="..\eglib\test\endian.c" />
- <ClCompile Include="..\eglib\test\fake.c" />
- <ClCompile Include="..\eglib\test\file.c" />
+ <ClCompile Include="..\mono\eglib\test\array.c" />
+ <ClCompile Include="..\mono\eglib\test\dir.c" />
+ <ClCompile Include="..\mono\eglib\test\driver.c" />
+ <ClCompile Include="..\mono\eglib\test\endian.c" />
+ <ClCompile Include="..\mono\eglib\test\fake.c" />
+ <ClCompile Include="..\mono\eglib\test\file.c" />
<ClCompile Include="getopt.c" />
<ClCompile Include="getopt_long.c" />
- <ClCompile Include="..\eglib\test\hashtable.c" />
- <ClCompile Include="..\eglib\test\list.c" />
- <ClCompile Include="..\eglib\test\markup.c" />
- <ClCompile Include="..\eglib\test\memory.c" />
- <ClCompile Include="..\eglib\test\module.c" />
- <ClCompile Include="..\eglib\test\path.c" />
- <ClCompile Include="..\eglib\test\pattern.c" />
- <ClCompile Include="..\eglib\test\ptrarray.c" />
- <ClCompile Include="..\eglib\test\queue.c" />
- <ClCompile Include="..\eglib\test\shell.c" />
- <ClCompile Include="..\eglib\test\sizes.c" />
- <ClCompile Include="..\eglib\test\slist.c" />
- <ClCompile Include="..\eglib\test\spawn.c" />
- <ClCompile Include="..\eglib\test\string-util.c" />
- <ClCompile Include="..\eglib\test\string.c" />
- <ClCompile Include="..\eglib\test\test.c" />
- <ClCompile Include="..\eglib\test\timer.c" />
- <ClCompile Include="..\eglib\test\unicode.c" />
- <ClCompile Include="..\eglib\test\utf8.c" />
+ <ClCompile Include="..\mono\eglib\test\hashtable.c" />
+ <ClCompile Include="..\mono\eglib\test\list.c" />
+ <ClCompile Include="..\mono\eglib\test\markup.c" />
+ <ClCompile Include="..\mono\eglib\test\memory.c" />
+ <ClCompile Include="..\mono\eglib\test\module.c" />
+ <ClCompile Include="..\mono\eglib\test\path.c" />
+ <ClCompile Include="..\mono\eglib\test\pattern.c" />
+ <ClCompile Include="..\mono\eglib\test\ptrarray.c" />
+ <ClCompile Include="..\mono\eglib\test\queue.c" />
+ <ClCompile Include="..\mono\eglib\test\shell.c" />
+ <ClCompile Include="..\mono\eglib\test\sizes.c" />
+ <ClCompile Include="..\mono\eglib\test\slist.c" />
+ <ClCompile Include="..\mono\eglib\test\spawn.c" />
+ <ClCompile Include="..\mono\eglib\test\string-util.c" />
+ <ClCompile Include="..\mono\eglib\test\string.c" />
+ <ClCompile Include="..\mono\eglib\test\test.c" />
+ <ClCompile Include="..\mono\eglib\test\timer.c" />
+ <ClCompile Include="..\mono\eglib\test\unicode.c" />
+ <ClCompile Include="..\mono\eglib\test\utf8.c" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="getopt.h" />
<ClInclude Include="getopt_long.h" />
- <ClInclude Include="..\eglib\src\glib.h" />
- <ClInclude Include="..\eglib\test\test.h" />
- <ClInclude Include="..\eglib\test\tests.h" />
+ <ClInclude Include="..\mono\eglib\src\glib.h" />
+ <ClInclude Include="..\mono\eglib\test\test.h" />
+ <ClInclude Include="..\mono\eglib\test\tests.h" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="eglib.vcxproj">
diff --git a/msvc/test_eglib.vcxproj.filters b/msvc/test_eglib.vcxproj.filters index a93fb6f29fa..9307397c737 100644 --- a/msvc/test_eglib.vcxproj.filters +++ b/msvc/test_eglib.vcxproj.filters @@ -1,22 +1,22 @@ -<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
- <ClCompile Include="..\eglib\test\array.c">
+ <ClCompile Include="..\mono\eglib\test\array.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\dir.c">
+ <ClCompile Include="..\mono\eglib\test\dir.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\driver.c">
+ <ClCompile Include="..\mono\eglib\test\driver.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\endian.c">
+ <ClCompile Include="..\mono\eglib\test\endian.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\fake.c">
+ <ClCompile Include="..\mono\eglib\test\fake.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\file.c">
+ <ClCompile Include="..\mono\eglib\test\file.c">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="getopt.c">
@@ -25,61 +25,61 @@ <ClCompile Include="getopt_long.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\hashtable.c">
+ <ClCompile Include="..\mono\eglib\test\hashtable.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\list.c">
+ <ClCompile Include="..\mono\eglib\test\list.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\markup.c">
+ <ClCompile Include="..\mono\eglib\test\markup.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\memory.c">
+ <ClCompile Include="..\mono\eglib\test\memory.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\module.c">
+ <ClCompile Include="..\mono\eglib\test\module.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\path.c">
+ <ClCompile Include="..\mono\eglib\test\path.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\pattern.c">
+ <ClCompile Include="..\mono\eglib\test\pattern.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\ptrarray.c">
+ <ClCompile Include="..\mono\eglib\test\ptrarray.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\queue.c">
+ <ClCompile Include="..\mono\eglib\test\queue.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\shell.c">
+ <ClCompile Include="..\mono\eglib\test\shell.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\sizes.c">
+ <ClCompile Include="..\mono\eglib\test\sizes.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\slist.c">
+ <ClCompile Include="..\mono\eglib\test\slist.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\spawn.c">
+ <ClCompile Include="..\mono\eglib\test\spawn.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\string.c">
+ <ClCompile Include="..\mono\eglib\test\string.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\string-util.c">
+ <ClCompile Include="..\mono\eglib\test\string-util.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\test.c">
+ <ClCompile Include="..\mono\eglib\test\test.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\utf8.c">
+ <ClCompile Include="..\mono\eglib\test\utf8.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\timer.c">
+ <ClCompile Include="..\mono\eglib\test\timer.c">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\eglib\test\unicode.c">
+ <ClCompile Include="..\mono\eglib\test\unicode.c">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
@@ -90,13 +90,13 @@ <ClInclude Include="getopt_long.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\eglib\src\glib.h">
+ <ClInclude Include="..\mono\eglib\src\glib.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\eglib\test\test.h">
+ <ClInclude Include="..\mono\eglib\test\test.h">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="..\eglib\test\tests.h">
+ <ClInclude Include="..\mono\eglib\test\tests.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
diff --git a/msvc/winsetup.bat b/msvc/winsetup.bat index d3729144a61..7cf6a0acdf4 100755 --- a/msvc/winsetup.bat +++ b/msvc/winsetup.bat @@ -1,11 +1,8 @@ @ECHO off SET CONFIG_H=..\config.h -SET EGLIB_CONFIG_H=..\eglib\config.h SET CYG_CONFIG_H=..\cygconfig.h -SET EGLIB_CYG_CONFIG_H=..\eglib\cygconfig.h SET WIN_CONFIG_H=..\winconfig.h -SET EGLIB_WIN_CONFIG_H=..\eglib\winconfig.h SET CONFIGURE_AC=..\configure.ac SET VERSION_H=..\mono\mini\version.h @@ -14,7 +11,6 @@ ECHO Setting up Mono configuration headers... REM Backup existing config.h into cygconfig.h if its not already replaced. %windir%\system32\WindowsPowerShell\v1.0\powershell.exe -executionpolicy bypass -NonInteractive -File backup-config-files.ps1 %CONFIG_H% %CYG_CONFIG_H% 2>&1 -%windir%\system32\WindowsPowerShell\v1.0\powershell.exe -executionpolicy bypass -NonInteractive -File backup-config-files.ps1 %EGLIB_CONFIG_H% %EGLIB_CYG_CONFIG_H% 2>&1 %windir%\system32\WindowsPowerShell\v1.0\powershell.exe -executionpolicy bypass -NonInteractive -File compare-config-files.ps1 %WIN_CONFIG_H% %CONFIG_H% %CONFIGURE_AC% 2>&1 @@ -25,13 +21,6 @@ IF NOT %ERRORLEVEL% == 0 ( %windir%\system32\WindowsPowerShell\v1.0\powershell.exe -NonInteractive -Command "$mono_version=[int[]](Select-String -path %CONFIGURE_AC% -pattern 'AC_INIT\(mono, \[(.*)\]').Matches[0].Groups[1].Value.Split('.'); $corlib_counter=[int](Select-String -path %CONFIGURE_AC% -pattern 'MONO_CORLIB_COUNTER=(.*)').Matches[0].Groups[1].Value; (Get-Content %CONFIG_H%) -replace '#MONO_CORLIB_VERSION#',('1{0:00}{1:00}{2:00}{3:000}' -f $mono_version[0],$mono_version[1],$mono_version[2],$corlib_counter) | Set-Content %CONFIG_H%" 2>&1 ) -%windir%\system32\WindowsPowerShell\v1.0\powershell.exe -executionpolicy bypass -NonInteractive -File compare-config-files.ps1 %EGLIB_WIN_CONFIG_H% %EGLIB_CONFIG_H% 2>&1 - -IF NOT %ERRORLEVEL% == 0 ( - ECHO copy %EGLIB_WIN_CONFIG_H% %EGLIB_CONFIG_H% - copy %EGLIB_WIN_CONFIG_H% %EGLIB_CONFIG_H% -) - SET VERSION_CONTENT="#define FULL_VERSION \"Visual Studio built mono\"" %windir%\system32\WindowsPowerShell\v1.0\powershell.exe -executionpolicy bypass -NonInteractive -File compare-config-content.ps1 %VERSION_CONTENT% %VERSION_H% 2>&1 |