diff --git a/plugins/spu2-x/src/CMakeLists.txt b/plugins/spu2-x/src/CMakeLists.txt index cadb90f946..87a6061598 100644 --- a/plugins/spu2-x/src/CMakeLists.txt +++ b/plugins/spu2-x/src/CMakeLists.txt @@ -14,7 +14,7 @@ endif() # plugin name set(Output spu2x-2.0.0) -if (Linux) +if (UNIX AND NOT APPLE) if (SDL2_API) set(spu2xFinalFlags "-DSPU2X_SDL2") else() diff --git a/plugins/spu2-x/src/Linux/Config.cpp b/plugins/spu2-x/src/Linux/Config.cpp index 659a6ee266..8f1239d51d 100644 --- a/plugins/spu2-x/src/Linux/Config.cpp +++ b/plugins/spu2-x/src/Linux/Config.cpp @@ -19,7 +19,7 @@ #include "Dialogs.h" #include "Config.h" -#ifdef __linux__ +#ifdef __unix__ #include #include #endif @@ -140,7 +140,7 @@ void ReadSettings() OutputAPI = 0; #endif -#ifdef __linux__ +#ifdef __unix__ CfgReadStr(L"SDL", L"HostApi", temp, L"pulseaudio"); SdlOutputAPI = -1; #if SDL_MAJOR_VERSION >= 2 @@ -156,7 +156,7 @@ void ReadSettings() SynchMode = CfgReadInt(L"OUTPUT", L"Synch_Mode", 0); PortaudioOut->ReadSettings(); -#ifdef __linux__ +#ifdef __unix__ SDLOut->ReadSettings(); #endif SoundtouchCfg::ReadSettings(); @@ -201,7 +201,7 @@ void WriteSettings() CfgWriteInt(L"DEBUG", L"DelayCycles", delayCycles); PortaudioOut->WriteSettings(); -#ifdef __linux__ +#ifdef __unix__ SDLOut->WriteSettings(); #endif SoundtouchCfg::WriteSettings(); @@ -271,9 +271,7 @@ void DisplayDialog() mod_box = gtk_combo_box_text_new(); gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(mod_box), "0 - No Sound (emulate SPU2 only)"); gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(mod_box), "1 - PortAudio (cross-platform)"); -#ifdef __linux__ gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(mod_box), "2 - SDL Audio (recommended for PulseAudio)"); -#endif //gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(mod_box), "3 - Alsa (probably doesn't work)"); gtk_combo_box_set_active(GTK_COMBO_BOX(mod_box), OutputModule);