From 641afa6517de33070e890488c7b04e9622962826 Mon Sep 17 00:00:00 2001
From: XProger <xproger@list.ru>
Date: Sat, 12 Jan 2019 16:59:54 +0300
Subject: [PATCH] #15 WIN32 centering window and hide console for release
 build, add application icon

---
 src/platform/win/OpenLara.rc              | Bin 0 -> 120 bytes
 src/platform/win/OpenLara.vcxproj         |  14 ++++++++----
 src/platform/win/OpenLara.vcxproj.filters |   6 +++++
 src/platform/win/OpenLara.vcxproj.user    |  20 ++++++++---------
 src/platform/win/icon.ico                 | Bin 0 -> 7406 bytes
 src/platform/win/main.cpp                 |  26 ++++++++++++++++++----
 6 files changed, 48 insertions(+), 18 deletions(-)
 create mode 100644 src/platform/win/OpenLara.rc
 create mode 100644 src/platform/win/icon.ico

diff --git a/src/platform/win/OpenLara.rc b/src/platform/win/OpenLara.rc
new file mode 100644
index 0000000000000000000000000000000000000000..9f444cf0b3468779a5623b28f604e12354ea9188
GIT binary patch
literal 120
wcmezW&zHfG!IQxch@BbyfwTf%NSrE!8A=S949N`n40#NCP?iz{F9R0?0ENd5LI3~&

literal 0
HcmV?d00001

diff --git a/src/platform/win/OpenLara.vcxproj b/src/platform/win/OpenLara.vcxproj
index 0be254e..c76a9aa 100644
--- a/src/platform/win/OpenLara.vcxproj
+++ b/src/platform/win/OpenLara.vcxproj
@@ -28,7 +28,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Editor|Win32'" Label="Configuration">
@@ -40,14 +40,14 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>NotSet</CharacterSet>
   </PropertyGroup>
@@ -145,7 +145,7 @@
       <WholeProgramOptimization>true</WholeProgramOptimization>
     </ClCompile>
     <Link>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
@@ -237,6 +237,12 @@
     <None Include="..\..\shaders\shader.glsl" />
     <None Include="..\..\shaders\water.glsl" />
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="OpenLara.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="icon.ico" />
+  </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
diff --git a/src/platform/win/OpenLara.vcxproj.filters b/src/platform/win/OpenLara.vcxproj.filters
index 2b14242..eaac777 100644
--- a/src/platform/win/OpenLara.vcxproj.filters
+++ b/src/platform/win/OpenLara.vcxproj.filters
@@ -89,4 +89,10 @@
       <UniqueIdentifier>{80edb27c-40cf-4f7a-a854-88eeba24a5fb}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="OpenLara.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="icon.ico" />
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/platform/win/OpenLara.vcxproj.user b/src/platform/win/OpenLara.vcxproj.user
index 29c03db..96911a8 100644
--- a/src/platform/win/OpenLara.vcxproj.user
+++ b/src/platform/win/OpenLara.vcxproj.user
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LocalDebuggerWorkingDirectory>..\..\..\bin</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-    <LocalDebuggerCommandArguments>GYM.PHD</LocalDebuggerCommandArguments>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
-    <LocalDebuggerWorkingDirectory>C:\Projects\OpenLara\bin\</LocalDebuggerWorkingDirectory>
-    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LocalDebuggerWorkingDirectory>C:\Projects\OpenLara\bin\TR3_PC</LocalDebuggerWorkingDirectory>
+    <LocalDebuggerWorkingDirectory>..\..\..\bin\TR1_PSX</LocalDebuggerWorkingDirectory>
     <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
     <LocalDebuggerCommandArguments>
     </LocalDebuggerCommandArguments>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
+    <LocalDebuggerWorkingDirectory>..\..\..\bin\TR1_PSX</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LocalDebuggerWorkingDirectory>..\..\..\bin\TR1_PSX</LocalDebuggerWorkingDirectory>
+    <DebuggerFlavor>WindowsLocalDebugger</DebuggerFlavor>
+    <LocalDebuggerCommandArguments>PSXDATA/GYM.PSX</LocalDebuggerCommandArguments>
+  </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/platform/win/icon.ico b/src/platform/win/icon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..7a5aed3341a523d0cfcb33802e456fc86bec6d0c
GIT binary patch
literal 7406
zcmeHLEl?dX5Z>JJE_e4Xm*;AqtVC6J@OWgWn3|%grt>_K4z7r*qKht?3UpOlgJ^3Q
zQ0Z>|UUHW^z;p)YcIJMP{mJIr{A>ciAcxIOKq}!=3-AK}mP=bM0ls71VqwZ}W&o>a
z0MD^VDzETisHdqiAN^+drUz+jYYVoww_#^z2X<fY!rtB<yxZT0_Xh`X^6>;tKcB+c
zmoxZwaRHZ?m+<SyPq@0eg1^82!1eVt+}zw4L(_XgU_#*0AfS{Q_O(T>7-n}lC5kI$
z7nCluUuFv}ztQKUYm9ki*RixrP;1Src~Cd@Yt1XYh>i&ok1<BzXllYGbwIIJrn5%D
z3k_k#tZDPXrQJ|nxWCS~h~!-e*kZ{3yf2R%Og#iu?2b|y?n0`q7r4(DDzGM?S!`bA
z02NlP-6>TR_1JweN4ImOsz8QEVUO+W0a24v0ToJ=Iky#VC>Xa0#9TFjF#T#DYFEkE
zJ<x)U>OoIVtb5dW1!{B_aGXil5R0Hy*MguJH7YrV@>aDzgjRuE+)xB*ig28H9GLM5
z4OBt99W5LQ9%j=*1sHB`q$5tQ`cP0zk${ga5;RXt=iDgbbLDaFnFq+wqz2nh$c1u&
zOo-!L#6FNfFsMCfNd=NDX@ohtbIJ>B!MTr0L-WM9M$lJ&ffx#w7muCq54BLx{`=*p
z%<kx{QxK{wu^)cUCX9BgY655!`$)q~W4~HOyi~!C=-$jq$x@wNCiILMk_qc^nh>q0
zP{>UD+X%PAgTJF>MqD#67dygOG##$*EpHqW_x1-7YMRl>)%VFA01}+3YC_<DAVBBT
zB|b0l@#j>(E9uJUoa)c0Z_OEXwOYa9;URoDI*QJ!=U>nL`SkYo77a}_Auu8E7!kmI
zyyx~z%F)xQkW!8$N2o64NIFF7GMSf?Co@iLDF<@F%y6BDdDoBH@lAHpbos60V-I+3
zkC?glmU%Yv(UwgSgmc&P$^3ksZa1Pd`P|$Zz|&0@f`s)ZJ+ThrGAyE_QXy<UrTdTg
zXI8<7r?%eY2q5ws={fdiZc(QuW-JkcM(Q&i1)wQI@2mmVkkW?fLUIVyl4HY~)}0Ui
zKnoTEk7>w8(4>yPj5;5RG*SpzcjFdFWSNkoxoU;}4GbS`Mu%Xe0Udz>_sM`B1S5Q)
z9**&6tw^9BbkT3iQQcE5P@Y0Z#U(yIPYL5g|F%r`>6E8XZbEs<@$s?FP3Zod?#|u4
zIciKaAuu8EL=Xt`6dtE6c(D~O7CGLoxb2!cPq%3`FkFur?ZEo%&w<m<&MK^-`$m?T
z&6#oh=BUn{#RByzMQ=+yCkw&VL4gfaPMm~t9u?_&!dQ1Eiq1_`_MponXXWAFf9T!^
AoB#j-

literal 0
HcmV?d00001

diff --git a/src/platform/win/main.cpp b/src/platform/win/main.cpp
index 54a5476..18e9a84 100644
--- a/src/platform/win/main.cpp
+++ b/src/platform/win/main.cpp
@@ -731,10 +731,12 @@ int main(int argc, char** argv) {
     _CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDOUT);
     _CrtMemCheckpoint(&_msBegin);
 //#elif PROFILE
-#else
+#elif PROFILE
 int main(int argc, char** argv) {
-//#else
-//int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
+#else
+int CALLBACK WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) {
+    int argc = lpCmdLine ? 2 : 1;
+    char *argv[] = { "", lpCmdLine };
 #endif
     cacheDir[0] = saveDir[0] = contentDir[0] = 0;
 
@@ -746,7 +748,23 @@ int main(int argc, char** argv) {
     RECT r = { 0, 0, 1280, 720 };
     AdjustWindowRect(&r, WS_OVERLAPPEDWINDOW, false);
 
-    hWnd = CreateWindow("static", "OpenLara", WS_OVERLAPPEDWINDOW, 0, 0, r.right - r.left, r.bottom - r.top, 0, 0, 0, 0);
+#ifndef _DEBUG
+    {
+        int ox = (GetSystemMetrics(SM_CXSCREEN) - (r.right - r.left)) / 2;
+        int oy = (GetSystemMetrics(SM_CYSCREEN) - (r.bottom - r.top)) / 2;
+        r.left   += ox;
+        r.top    += oy;
+        r.right  += ox;
+        r.bottom += oy;
+    }
+#else
+    r.right += r.left;
+    r.bottom += r.top;
+    r.left = r.top = 0;
+#endif
+
+    hWnd = CreateWindow("static", "OpenLara", WS_OVERLAPPEDWINDOW, r.left, r.top, r.right - r.left, r.bottom - r.top, 0, 0, 0, 0);
+    SendMessage(hWnd, WM_SETICON, 1, (LPARAM)LoadIcon(GetModuleHandle(NULL), "MAINICON"));
 
     ContextCreate();