Browse Source

Merge pull request #1819 from Er2ch/12.0-development

Fix compilation error on old SDL2 library.
Alex Szpakowski 3 years ago
parent
commit
6d29384dc8
2 changed files with 14 additions and 1 deletions
  1. 10 0
      .gitignore
  2. 4 1
      src/modules/system/sdl/System.cpp

+ 10 - 0
.gitignore

@@ -1,3 +1,13 @@
+# automake products
+/config.h
+/config.h.in
+/config.log
+/config.status
+/configure
+/configure-modules-post.ac
+/configure-modules-pre.ac
+/configure.ac
+
 /extra/reshax/Release/
 /extra/reshax/Debug/
 /extra/reshax/resources.h

+ 4 - 1
src/modules/system/sdl/System.cpp

@@ -25,9 +25,12 @@
 // SDL
 #include <SDL_clipboard.h>
 #include <SDL_cpuinfo.h>
-#include <SDL_locale.h>
 #include <SDL_version.h>
 
+#if SDL_VERSION_ATLEAST(2, 0, 14)
+#include <SDL_locale.h>
+#endif
+
 namespace love
 {
 namespace system