X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=pcsx_rearmed.git;a=blobdiff_plain;f=configure;h=7cfd626af13abe393dae2b453043926296d2895b;hp=47c68b8e876ee6667e8666b17eca30562e84d6b3;hb=ac6575cdd93d665efc374c1a14b391c6a5308972;hpb=4132e8ca13b6395f8a9ef7ec7d01cbdcc19c037d

diff --git a/configure b/configure
index 47c68b8e..7cfd626a 100755
--- a/configure
+++ b/configure
@@ -41,6 +41,7 @@ optimize_arm926ej="no"
 
 # hardcoded stuff
 CC="${CC-${CROSS_COMPILE}gcc}"
+CXX="${CXX-${CROSS_COMPILE}g++}"
 AS="${AS-${CROSS_COMPILE}as}"
 AR="${AS-${CROSS_COMPILE}ar}"
 config_mak="config.mak"
@@ -110,7 +111,7 @@ if [ "$show_help" = "yes" ]; then
   echo "  --disable-dynarec        disable dynamic recompiler"
   echo "                           (dynarec is only available and enabled on ARM)"
   echo "influential environment variables:"
-  echo "  CROSS_COMPILE CC AS AR CFLAGS ASFLAGS LDFLAGS LDLIBS"
+  echo "  CROSS_COMPILE CC CXX AS AR CFLAGS ASFLAGS LDFLAGS LDLIBS"
   exit 1
 fi
 
@@ -193,7 +194,12 @@ if [ "$ram_fixed" = "yes" ]; then
   CFLAGS="$CFLAGS -DRAM_FIXED"
 fi
 
-if [ "$platform" = "maemo" ]; then
+if [ "$platform" = "generic" ]; then
+  generic_cflags=`sdl-config --cflags`
+  generic_ldlibs=`sdl-config --libs`
+  CFLAGS="$CFLAGS $generic_cflags"
+  LDFLAGS="$LDFLAGS $generic_ldlibs"
+elif [ "$platform" = "maemo" ]; then
   maemo_cflags=`pkg-config --cflags hildon-1`
   maemo_ldlibs=`pkg-config --libs hildon-1`
   CFLAGS="$CFLAGS -DMAEMO -DMAEMO_CHANGES $maemo_cflags"
@@ -223,6 +229,7 @@ echo "platform            $platform"
 echo "sound driver        $sound_driver"
 echo "C compiler          $CC"
 echo "C compiler flags    $CFLAGS"
+echo "linker flags        $LDFLAGS"
 echo "enable dynarec      $enable_dynarec"
 echo "ARMv7 optimizations $have_armv7"
 echo "enable ARM NEON     $have_arm_neon"
@@ -234,6 +241,7 @@ printf " '%s'" "$0" "$@" >> $config_mak
 echo >> $config_mak
 
 echo "CC = $CC" >> $config_mak
+echo "CXX = $CXX" >> $config_mak
 echo "AS = $AS" >> $config_mak
 echo "CFLAGS += $CFLAGS" >> $config_mak
 echo "ASFLAGS += $ASFLAGS" >> $config_mak