Only use SDL specific code on Android and OSX when USE_SDL is defined

EasyRPG · Apr 14, 2019 · 2949343 · 2949343
1 parent d953825
commit 2949343
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/decoder_wildmidi.cpp b/src/decoder_wildmidi.cpp
@@ -35,7 +35,7 @@
 #  define WILDMIDI_FREQ 44100
 #endif
 
-#ifdef __ANDROID__
+#if defined(USE_SDL) && defined(__ANDROID__)
 #  include <jni.h>
 #  include "SDL_system.h"
 #  include "string.h"
@@ -46,7 +46,7 @@
  */
 #define WILDMIDI_OPTS 0
 
-#ifdef __ANDROID__
+#if defined(USE_SDL) && defined(__ANDROID__)
 std::string get_timidity_path_jni() {
 	JNIEnv* env = (JNIEnv*)SDL_AndroidGetJNIEnv();
 	jobject sdl_activity = (jobject)SDL_AndroidGetActivity();

diff --git a/src/filefinder.cpp b/src/filefinder.cpp
@@ -62,7 +62,7 @@
 #  include <sys/types.h>
 #endif
 
-#ifdef __ANDROID__
+#if defined(USE_SDL) && defined(__ANDROID__)
 #   include <jni.h>
 #   include <SDL_system.h>
 #endif

diff --git a/src/main_data.cpp b/src/main_data.cpp
@@ -42,7 +42,7 @@
 #elif defined(PSP2)
 #  include <cstdio>
 #  include <psp2/io/stat.h>
-#elif defined(__APPLE__) && defined(__MACH__)
+#if defined(USE_SDL) && defined(__APPLE__) && defined(__MACH__)
 #  include <SDL.h>
 #endif
 
@@ -132,7 +132,7 @@ void Main_Data::Init() {
 				// No RomFS -> load games from hardcoded path
 				project_path = "sdmc:/3ds/easyrpg-player";
 			}
-#elif defined(__APPLE__) && defined(__MACH__)
+#elif defined(USE_SDL) && defined(__APPLE__) && defined(__MACH__)
 #  if SDL_MAJOR_VERSION>1
 			// Apple Finder does not set the working directory
 			// It points to HOME instead. When it is HOME change it to