Add x64 support for xrWeatherEditor

Thanks to ForserX
OpenXRay · Nov 5, 2017 · 4c23540 · 4c23540
1 parent e438703
commit 4c23540
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/src/editors/xrWeatherEditor/entry_point.cpp b/src/editors/xrWeatherEditor/entry_point.cpp
@@ -30,10 +30,14 @@ ref class window_ide_final : public editor::window_ide
 protected:
  virtual void WndProc(Message % m) override
  {
- LRESULT result;
- if (m_engine &&
-  m_engine->on_message((HWND)m.HWnd.ToInt32(), m.Msg, m.WParam.ToInt32(), m.LParam.ToInt32(), result))
+ LONG_PTR result;
+#ifdef XR_X64
+ if (m_engine && m_engine->on_message((HWND)m.HWnd.ToInt32(), m.Msg, m.WParam.ToInt64(), m.LParam.ToInt64(), result))
  return;
+#else
+ if (m_engine && m_engine->on_message((HWND)m.HWnd.ToInt32(), m.Msg, m.WParam.ToInt32(), m.LParam.ToInt32(), result))
+ return;
+#endif
 
  editor::window_ide::WndProc(m);
  }

diff --git a/src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj b/src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj
@@ -124,7 +124,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
  <ClCompile>
  <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>EDITOR_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>EDITOR_LIBRARY;XR_X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  <FloatingPointModel>Fast</FloatingPointModel>
  <PrecompiledHeader>Use</PrecompiledHeader>
@@ -144,7 +144,7 @@
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  <ClCompile>
  <Optimization>Disabled</Optimization>
- <PreprocessorDefinitions>EDITOR_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>EDITOR_LIBRARY;XR_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  <FloatingPointModel>Fast</FloatingPointModel>
  <PrecompiledHeader>Use</PrecompiledHeader>
@@ -163,7 +163,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
  <ClCompile>
- <PreprocessorDefinitions>EDITOR_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>EDITOR_LIBRARY;XR_X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  <FloatingPointModel>Fast</FloatingPointModel>
  <PrecompiledHeader>Use</PrecompiledHeader>
@@ -181,7 +181,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  <ClCompile>
- <PreprocessorDefinitions>EDITOR_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>EDITOR_LIBRARY;XR_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  <FloatingPointModel>Fast</FloatingPointModel>
  <PrecompiledHeader>Use</PrecompiledHeader>
@@ -199,7 +199,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
  <ClCompile>
- <PreprocessorDefinitions>EDITOR_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>EDITOR_LIBRARY;XR_X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  <FloatingPointModel>Fast</FloatingPointModel>
  <PrecompiledHeader>Use</PrecompiledHeader>
@@ -218,7 +218,7 @@
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
  <ClCompile>
- <PreprocessorDefinitions>EDITOR_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>EDITOR_LIBRARY;XR_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
  <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  <FloatingPointModel>Fast</FloatingPointModel>
  <PrecompiledHeader>Use</PrecompiledHeader>