From 65488ad0b1e53329f18b8f494bb3864b9448e87b Mon Sep 17 00:00:00 2001 From: Xottab-DUTY Date: Thu, 1 Feb 2018 20:46:57 +0500 Subject: [PATCH] xrWeatherEditor: change PRODUCT_NAME to CoP instead of CS Remove unneeded windows.h include Solution: build xrEngine after xrWeatherEditor --- src/editors/xrWeatherEditor/engine_include.hpp | 1 - src/editors/xrWeatherEditor/window_ide_serialize.cpp | 2 +- src/engine.sln | 3 +++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/editors/xrWeatherEditor/engine_include.hpp b/src/editors/xrWeatherEditor/engine_include.hpp index 2a8f032659d..2f8144a69da 100644 --- a/src/editors/xrWeatherEditor/engine_include.hpp +++ b/src/editors/xrWeatherEditor/engine_include.hpp @@ -10,7 +10,6 @@ #define ENGINE_INCLUDE_HPP_INCLUDED #pragma unmanaged -#include #include "include/editor/engine.hpp" #pragma managed diff --git a/src/editors/xrWeatherEditor/window_ide_serialize.cpp b/src/editors/xrWeatherEditor/window_ide_serialize.cpp index df0fa761272..e0c08614144 100644 --- a/src/editors/xrWeatherEditor/window_ide_serialize.cpp +++ b/src/editors/xrWeatherEditor/window_ide_serialize.cpp @@ -16,7 +16,7 @@ using Microsoft::Win32::RegistryKey; using Microsoft::Win32::RegistryValueKind; #define COMPANY_NAME "GSC Game World" -#define PRODUCT_NAME "S.T.A.L.K.E.R.: CLear Sky" +#define PRODUCT_NAME "S.T.A.L.K.E.R.: Call of Pripyat" template inline static T registry_value(RegistryKey ^ key, System::String ^ value_id, const T& default_value) diff --git a/src/engine.sln b/src/engine.sln index 1dda51dcbc4..e33674323b9 100644 --- a/src/engine.sln +++ b/src/engine.sln @@ -109,6 +109,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrRender_R3", "Layers\xrRenderPC_R3\xrRender_R3.vcxproj", "{3F383D3C-FCD8-4170-990B-EB4833F09248}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrEngine", "xrEngine\xrEngine.vcxproj", "{2578C6D8-660D-48AE-9322-7422F8664F06}" + ProjectSection(ProjectDependencies) = postProject + {492D3DFE-9068-4E7E-A008-7C2420A651C0} = {492D3DFE-9068-4E7E-A008-7C2420A651C0} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrLC_Light", "utils\xrLC_Light\xrLC_Light.vcxproj", "{EFB76D6F-0092-439C-A783-C0BE10BD17C9}" ProjectSection(ProjectDependencies) = postProject