Commit 5790f59f88302a2dcbb170330d7b9fef1e045da9
2015-12-02T08:04:17
WinRT: minor tweak to NuGet package naming
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101
diff --git a/VisualC-WinRT/SDL2main-WinRT-CoreWindow.nuspec b/VisualC-WinRT/SDL2main-WinRT-CoreWindow.nuspec
deleted file mode 100644
index f199c21..0000000
--- a/VisualC-WinRT/SDL2main-WinRT-CoreWindow.nuspec
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<package >
- <metadata>
- <id>SDL2main-WinRT-CoreWindow</id>
- <version>2.0.4-Unofficial</version>
- <authors>Sam Lantinga</authors>
- <owners>David Ludwig</owners>
- <licenseUrl>http://libsdl.org/license.php</licenseUrl>
- <projectUrl>http://libsdl.org</projectUrl>
- <requireLicenseAcceptance>false</requireLicenseAcceptance>
- <description>WinMain() function for SDL2 + WinRT + CoreWindow (non-XAML) apps</description>
- <copyright>Copyright 2015</copyright>
- <tags>SDL2 SDL LibSDL OpenGL C C++ nativepackage</tags>
- <dependencies>
- <dependency id="SDL2-WinRT" version="2.0.4"/>
- </dependencies>
- </metadata>
- <files>
- <file src="..\src\main\winrt\SDL_winrt_main_NonXAML.cpp" target="src\main\winrt"/>
- <file src="SDL2main-WinRT-CoreWindow.targets" target="build\native"/>
- </files>
-</package>
diff --git a/VisualC-WinRT/SDL2main-WinRT-CoreWindow.targets b/VisualC-WinRT/SDL2main-WinRT-CoreWindow.targets
deleted file mode 100644
index 53c5e5e..0000000
--- a/VisualC-WinRT/SDL2main-WinRT-CoreWindow.targets
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
- <ItemGroup Label="LibSDL2">
- <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\main\winrt\SDL_winrt_main_NonXAML.cpp">
- <CompileAsWinRT>true</CompileAsWinRT>
- </ClCompile>
- </ItemGroup>
-
-</Project>
diff --git a/VisualC-WinRT/SDL2main-WinRT-NonXAML.nuspec b/VisualC-WinRT/SDL2main-WinRT-NonXAML.nuspec
new file mode 100644
index 0000000..4f24fec
--- /dev/null
+++ b/VisualC-WinRT/SDL2main-WinRT-NonXAML.nuspec
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+<package >
+ <metadata>
+ <id>SDL2main-WinRT-NonXAML</id>
+ <version>2.0.4-Unofficial</version>
+ <authors>Sam Lantinga</authors>
+ <owners>David Ludwig</owners>
+ <licenseUrl>http://libsdl.org/license.php</licenseUrl>
+ <projectUrl>http://libsdl.org</projectUrl>
+ <requireLicenseAcceptance>false</requireLicenseAcceptance>
+ <description>WinMain() function for SDL2 + WinRT + CoreWindow (non-XAML) apps</description>
+ <copyright>Copyright 2015</copyright>
+ <tags>SDL2 SDL LibSDL OpenGL C C++ nativepackage</tags>
+ <dependencies>
+ <dependency id="SDL2-WinRT" version="2.0.4"/>
+ </dependencies>
+ </metadata>
+ <files>
+ <file src="..\src\main\winrt\SDL_winrt_main_NonXAML.cpp" target="src\main\winrt"/>
+ <file src="SDL2main-WinRT-NonXAML.targets" target="build\native"/>
+ </files>
+</package>
diff --git a/VisualC-WinRT/SDL2main-WinRT-NonXAML.targets b/VisualC-WinRT/SDL2main-WinRT-NonXAML.targets
new file mode 100644
index 0000000..53c5e5e
--- /dev/null
+++ b/VisualC-WinRT/SDL2main-WinRT-NonXAML.targets
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+ <ItemGroup Label="LibSDL2">
+ <ClCompile Include="$(MSBuildThisFileDirectory)..\..\src\main\winrt\SDL_winrt_main_NonXAML.cpp">
+ <CompileAsWinRT>true</CompileAsWinRT>
+ </ClCompile>
+ </ItemGroup>
+
+</Project>
diff --git a/build-scripts/winrtbuild.ps1 b/build-scripts/winrtbuild.ps1
index 3377809..31ac504 100644
--- a/build-scripts/winrtbuild.ps1
+++ b/build-scripts/winrtbuild.ps1
@@ -274,7 +274,7 @@ if ($DidAnyDLLBuildFail -eq $true) {
if ( ! $? ) { $DidAnyNugetBuildFail = $true }
# Package SDL2main:
- $NugetOptions[1] = "$PSScriptRoot\..\VisualC-WinRT\SDL2main-WinRT-CoreWindow.nuspec"
+ $NugetOptions[1] = "$PSScriptRoot\..\VisualC-WinRT\SDL2main-WinRT-NonXAML.nuspec"
&"$NugetPath" $NugetOptions
if ( ! $? ) { $DidAnyNugetBuildFail = $true }
}