Pārlūkot izejas kodu

fix third party bug for El Capitan and update gitignore for files created when 'dot' dependency is missing (#2687)

UkoeHB 5 gadi atpakaļ
vecāks
revīzija
0f4b769f1a
2 mainītis faili ar 12 papildinājumiem un 0 dzēšanām
  1. 4 0
      .gitignore
  2. 8 0
      Source/ThirdParty/SDL/src/video/cocoa/SDL_cocoavideo.h

+ 4 - 0
.gitignore

@@ -116,3 +116,7 @@ configure*
 *.bak
 Thumbs.db
 .directory
+
+# Doxygen mess from absence of 'dot' dependency
+CMakeDoxyFile.in
+CMakeDoxygenDefaults.cmake

+ 8 - 0
Source/ThirdParty/SDL/src/video/cocoa/SDL_cocoavideo.h

@@ -18,6 +18,9 @@
      misrepresented as being the original software.
   3. This notice may not be removed or altered from any source distribution.
 */
+
+// Modified by UkoeHB for Urho3D
+
 #include "../../SDL_internal.h"
 
 #ifndef SDL_cocoavideo_h_
@@ -116,6 +119,11 @@ extern NSImage * Cocoa_CreateImage(SDL_Surface * surface);
 /* Fix build with the 10.10 SDK */
 #if MAC_OS_X_VERSION_MAX_ALLOWED < 101100
 #define NSEventSubtypeTouch NSTouchEventSubtype
+// Urho3D: begin edit (fixes build failure on El Capitan, OSX 10.12)
+#endif
+/* Fix build with the 10.11 SDK */
+#if MAC_OS_X_VERSION_MAX_ALLOWED < 101200
+// Urho3D: end edit
 #define NSEventSubtypeMouseEvent NSMouseEventSubtype
 #endif