Merge pull request #261 from rakslice/sdl3_include_fix

Fix for SDL3 include autoconf
kanjitalk755 · Jan 31, 2025 · 6c30a1a · 6c30a1a
2 parents a267492 + 067e89c
commit 6c30a1a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/BasiliskII/src/Unix/configure.ac b/BasiliskII/src/Unix/configure.ac
@@ -335,7 +335,7 @@ if [[ "x$WANT_SDL" = "xyes" ]]; then
     if [[ "x$TEMP_WANT_SDL_VERSION_MAJOR" = "x3" ]]; then
       PKG_CHECK_MODULES([sdl3], [sdl3 >= 3.0], [
         CXXFLAGS="$CXXFLAGS $sdl3_CFLAGS"
-        CXXFLAGS+=`echo " $sdl3_CFLAGS" | sed -e 's/\(-I.*include\)/\1\/SDL3/'`
+        CXXFLAGS="$CXXFLAGS `echo " $sdl3_CFLAGS" | sed -e 's/\(-I.*include\)/\1\/SDL3/'`"
         LIBS="$LIBS $sdl3_LIBS"
         WANT_SDL_VERSION_MAJOR=3
       ], [

diff --git a/BasiliskII/src/Windows/configure.ac b/BasiliskII/src/Windows/configure.ac
@@ -561,7 +561,7 @@ CPUSRCS="../uae_cpu/basilisk_glue.cpp ../uae_cpu/memory.cpp ../uae_cpu/newcpu.cp
 dnl We really want SDL for now
 if [[ "x$WANT_SDL_VERSION_MAJOR" = "x3" ]]; then
   SDL_CFLAGS=`pkg-config sdl3 --cflags`
-  SDL_CFLAGS+=`echo " $SDL_CFLAGS" | sed -e 's/\(-I.*include\)/\1\/SDL3/'`
+  SDL_CFLAGS="$SDL_CFLAGS `echo " $SDL_CFLAGS" | sed -e 's/\(-I.*include\)/\1\/SDL3/'`"
   SDL_LIBS=`pkg-config sdl3 --libs | sed -e 's/-lSDL3/-lSDL3.dll/'`
 else
   SDL_CFLAGS=`sdl2-config --cflags`

diff --git a/SheepShaver/src/Unix/configure.ac b/SheepShaver/src/Unix/configure.ac
@@ -224,7 +224,7 @@ if [[ "x$WANT_SDL" = "xyes" ]]; then
     if [[ "x$TEMP_WANT_SDL_VERSION_MAJOR" = "x3" ]]; then
       PKG_CHECK_MODULES([sdl3], [sdl3 >= 3.0], [
         CXXFLAGS="$CXXFLAGS $sdl3_CFLAGS"
-        CXXFLAGS+=`echo " $sdl3_CFLAGS" | sed -e 's/\(-I.*include\)/\1\/SDL3/'`
+        CXXFLAGS="$CXXFLAGS `echo " $sdl3_CFLAGS" | sed -e 's/\(-I.*include\)/\1\/SDL3/'`"
         LIBS="$LIBS $sdl3_LIBS"
         WANT_SDL_VERSION_MAJOR=3
       ], [

diff --git a/SheepShaver/src/Windows/configure.ac b/SheepShaver/src/Windows/configure.ac
@@ -278,7 +278,7 @@ CPUSRCS="$CPUSRCS ../dummy/prefs_dummy.cpp"
 dnl We really want SDL for now
 if [[ "x$WANT_SDL_VERSION_MAJOR" = "x3" ]]; then
   SDL_CFLAGS=`pkg-config sdl3 --cflags`
-  SDL_CFLAGS+=`echo " $SDL_CFLAGS" | sed -e 's/\(-I.*include\)/\1\/SDL3/'`
+  SDL_CFLAGS="$SDL_CFLAGS `echo " $SDL_CFLAGS" | sed -e 's/\(-I.*include\)/\1\/SDL3/'`"
   SDL_LIBS=`pkg-config sdl3 --libs | sed -e 's/-lSDL3/-lSDL3.dll/'`
 else
   SDL_CFLAGS=`sdl2-config --cflags`