Skip to content

Commit 4c23540

Browse files
committed
Add x64 support for xrWeatherEditor
Thanks to ForserX
1 parent e438703 commit 4c23540

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

src/editors/xrWeatherEditor/entry_point.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,14 @@ ref class window_ide_final : public editor::window_ide
3030
protected:
3131
virtual void WndProc(Message % m) override
3232
{
33-
LRESULT result;
34-
if (m_engine &&
35-
m_engine->on_message((HWND)m.HWnd.ToInt32(), m.Msg, m.WParam.ToInt32(), m.LParam.ToInt32(), result))
33+
LONG_PTR result;
34+
#ifdef XR_X64
35+
if (m_engine && m_engine->on_message((HWND)m.HWnd.ToInt32(), m.Msg, m.WParam.ToInt64(), m.LParam.ToInt64(), result))
3636
return;
37+
#else
38+
if (m_engine && m_engine->on_message((HWND)m.HWnd.ToInt32(), m.Msg, m.WParam.ToInt32(), m.LParam.ToInt32(), result))
39+
return;
40+
#endif
3741

3842
editor::window_ide::WndProc(m);
3943
}

src/editors/xrWeatherEditor/xrWeatherEditor.vcxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@
124124
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
125125
<ClCompile>
126126
<Optimization>Disabled</Optimization>
127-
<PreprocessorDefinitions>EDITOR_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
127+
<PreprocessorDefinitions>EDITOR_LIBRARY;XR_X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
128128
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
129129
<FloatingPointModel>Fast</FloatingPointModel>
130130
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -144,7 +144,7 @@
144144
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
145145
<ClCompile>
146146
<Optimization>Disabled</Optimization>
147-
<PreprocessorDefinitions>EDITOR_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
147+
<PreprocessorDefinitions>EDITOR_LIBRARY;XR_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
148148
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
149149
<FloatingPointModel>Fast</FloatingPointModel>
150150
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -163,7 +163,7 @@
163163
</ItemDefinitionGroup>
164164
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
165165
<ClCompile>
166-
<PreprocessorDefinitions>EDITOR_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
166+
<PreprocessorDefinitions>EDITOR_LIBRARY;XR_X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
167167
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
168168
<FloatingPointModel>Fast</FloatingPointModel>
169169
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -181,7 +181,7 @@
181181
</ItemDefinitionGroup>
182182
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
183183
<ClCompile>
184-
<PreprocessorDefinitions>EDITOR_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
184+
<PreprocessorDefinitions>EDITOR_LIBRARY;XR_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
185185
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
186186
<FloatingPointModel>Fast</FloatingPointModel>
187187
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -199,7 +199,7 @@
199199
</ItemDefinitionGroup>
200200
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|Win32'">
201201
<ClCompile>
202-
<PreprocessorDefinitions>EDITOR_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
202+
<PreprocessorDefinitions>EDITOR_LIBRARY;XR_X86;%(PreprocessorDefinitions)</PreprocessorDefinitions>
203203
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
204204
<FloatingPointModel>Fast</FloatingPointModel>
205205
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -218,7 +218,7 @@
218218
</ItemDefinitionGroup>
219219
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Mixed|x64'">
220220
<ClCompile>
221-
<PreprocessorDefinitions>EDITOR_LIBRARY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
221+
<PreprocessorDefinitions>EDITOR_LIBRARY;XR_X64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
222222
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
223223
<FloatingPointModel>Fast</FloatingPointModel>
224224
<PrecompiledHeader>Use</PrecompiledHeader>

0 commit comments

Comments
 (0)