From df200c3485689a29e2178c713d1f32b971f6f4e3 Mon Sep 17 00:00:00 2001
From: mathusummut <mathusum.mut@gmail.com>
Date: Thu, 10 May 2018 01:16:14 +0200
Subject: [PATCH] Polished ZG 32-bit build [skip ci]

---
 mk/windows/build-zg.bat                                       | 2 +-
 mk/windows/group-binaries.bat                                 | 4 ++--
 mk/windows/vs2015-32/ZetaGlest.sln                            | 2 +-
 .../vs2015-32/{g3d_viewer.vcxproj => g3dviewer.vcxproj}       | 4 ++--
 mk/windows/vs2017-32/ZetaGlest.sln                            | 2 +-
 .../vs2017-32/{g3d_viewer.vcxproj => g3dviewer.vcxproj}       | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename mk/windows/vs2015-32/{g3d_viewer.vcxproj => g3dviewer.vcxproj} (99%)
 rename mk/windows/vs2017-32/{g3d_viewer.vcxproj => g3dviewer.vcxproj} (99%)

diff --git a/mk/windows/build-zg.bat b/mk/windows/build-zg.bat
index 2ace15d7e..27dd72fe5 100644
--- a/mk/windows/build-zg.bat
+++ b/mk/windows/build-zg.bat
@@ -169,6 +169,6 @@ call .\group-binaries.bat
 ECHO ... Done.
 ECHO.
 ECHO If build was successful, then output is in bin folder, otherwise scroll up a little to view error messages.
-ECHO Thanks for trying out ZetaGlest!
+ECHO Thanks for trying out ZetaGlest.
 ECHO.
 pause
\ No newline at end of file
diff --git a/mk/windows/group-binaries.bat b/mk/windows/group-binaries.bat
index a6e6cf58a..31b6f97b9 100644
--- a/mk/windows/group-binaries.bat
+++ b/mk/windows/group-binaries.bat
@@ -18,8 +18,8 @@ copy /y ..\shared\glestkeys.ini bin\vs2017\glestkeys.ini
 copy /y ..\shared\servers.ini bin\vs2015\servers.ini
 copy /y ..\shared\servers.ini bin\vs2017\servers.ini
 
-copy /y vs2015-32\g3d_viewerWin32\Release\g3dviewer.exe bin\vs2015\g3dviewer-32.exe
-copy /y vs2017-32\g3d_viewerWin32\Release\g3dviewer.exe bin\vs2017\g3dviewer-32.exe
+copy /y vs2015-32\g3dviewerWin32\Release\g3dviewer.exe bin\vs2015\g3dviewer-32.exe
+copy /y vs2017-32\g3dviewerWin32\Release\g3dviewer.exe bin\vs2017\g3dviewer-32.exe
 
 copy /y vs2015-32\map_editorWin32\Release\map_editor.exe bin\vs2015\map_editor-32.exe
 copy /y vs2017-32\map_editorWin32\Release\map_editor.exe bin\vs2017\map_editor-32.exe
diff --git a/mk/windows/vs2015-32/ZetaGlest.sln b/mk/windows/vs2015-32/ZetaGlest.sln
index a5b55d418..552cac21f 100644
--- a/mk/windows/vs2015-32/ZetaGlest.sln
+++ b/mk/windows/vs2015-32/ZetaGlest.sln
@@ -11,7 +11,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstreflop", "libstreflop.
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g2xml", "g2xml.vcxproj", "{407355A4-D12A-4E3B-A7EB-A835E573B376}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3d_viewer", "g3d_viewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dviewer", "g3dviewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map_editor", "map_editor.vcxproj", "{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}"
 EndProject
diff --git a/mk/windows/vs2015-32/g3d_viewer.vcxproj b/mk/windows/vs2015-32/g3dviewer.vcxproj
similarity index 99%
rename from mk/windows/vs2015-32/g3d_viewer.vcxproj
rename to mk/windows/vs2015-32/g3dviewer.vcxproj
index add0c2b26..11d86e67d 100644
--- a/mk/windows/vs2015-32/g3d_viewer.vcxproj
+++ b/mk/windows/vs2015-32/g3dviewer.vcxproj
@@ -12,9 +12,9 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{FE5C7C7C-F109-44F5-8329-25A4E24F162C}</ProjectGuid>
-    <RootNamespace>g3d_viewer</RootNamespace>
+    <RootNamespace>g3dviewer</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <ProjectName>g3d_viewer</ProjectName>
+    <ProjectName>g3dviewer</ProjectName>
     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
diff --git a/mk/windows/vs2017-32/ZetaGlest.sln b/mk/windows/vs2017-32/ZetaGlest.sln
index b6740a48d..8b216b401 100644
--- a/mk/windows/vs2017-32/ZetaGlest.sln
+++ b/mk/windows/vs2017-32/ZetaGlest.sln
@@ -11,7 +11,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libstreflop", "libstreflop.
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g2xml", "g2xml.vcxproj", "{407355A4-D12A-4E3B-A7EB-A835E573B376}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3d_viewer", "g3d_viewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g3dviewer", "g3dviewer.vcxproj", "{FE5C7C7C-F109-44F5-8329-25A4E24F162C}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "map_editor", "map_editor.vcxproj", "{5D09BE33-81EC-450B-8A7B-2E7B941ADC56}"
 EndProject
diff --git a/mk/windows/vs2017-32/g3d_viewer.vcxproj b/mk/windows/vs2017-32/g3dviewer.vcxproj
similarity index 99%
rename from mk/windows/vs2017-32/g3d_viewer.vcxproj
rename to mk/windows/vs2017-32/g3dviewer.vcxproj
index 16069e7c1..eaea90ea8 100644
--- a/mk/windows/vs2017-32/g3d_viewer.vcxproj
+++ b/mk/windows/vs2017-32/g3dviewer.vcxproj
@@ -12,9 +12,9 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{FE5C7C7C-F109-44F5-8329-25A4E24F162C}</ProjectGuid>
-    <RootNamespace>g3d_viewer</RootNamespace>
+    <RootNamespace>g3dviewer</RootNamespace>
     <Keyword>Win32Proj</Keyword>
-    <ProjectName>g3d_viewer</ProjectName>
+    <ProjectName>g3dviewer</ProjectName>
     <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />