Bläddra i källkod

SDL: Fix HAVE_XGENERICEVENT checking https://github.com/urho3d/Urho3D/issues/3052 [cache clear]

1vanK 3 år sedan
förälder
incheckning
f32937f929
2 ändrade filer med 8 tillägg och 1 borttagningar
  1. 7 1
      Source/ThirdParty/SDL/CMakeLists.txt
  2. 1 0
      Source/ThirdParty/SDL/Urho3DNotes.txt

+ 7 - 1
Source/ThirdParty/SDL/CMakeLists.txt

@@ -19,11 +19,17 @@
 # 3. This notice may not be removed or altered from any source distribution.
 #
 
-# Modified by Yao Wei Tjong for Urho3D, the modified portion is licensed under below license
+# Modified for Urho3D, the modified portion is licensed under below license
 
 # Copyright (c) 2008-2022 the Urho3D project
 # License: MIT
 
+# Urho3D: This hack allows build 32-bit version on Linux Mint x64
+# TODO: Why is it not being detected correctly?
+if (CMAKE_LIBRARY_ARCHITECTURE STREQUAL "x86_64-linux-gnu" AND NOT URHO3D_64BIT)
+    set (CMAKE_LIBRARY_ARCHITECTURE "i386-linux-gnu")
+endif ()
+
 # Urho3D - commented out in-source tree build prevention as Urho3D supports both out-of-source and in-source tree builds
 
 # Urho3D - commented out setting SDL2 as project name as we want SDL sub-library to remain within Urho3D "umbrella" project

+ 1 - 0
Source/ThirdParty/SDL/Urho3DNotes.txt

@@ -0,0 +1 @@
+Verison: https://github.com/libsdl-org/SDL/releases/tag/release-2.0.10