J :

* Fix the way features are tested.
2010-02-02 09:38:22 +00:00
parent 64260f5787
commit 2163bdbec5
4 changed files with 6 additions and 6 deletions
--- a/JGE/Makefile
+++ b/JGE/Makefile
@@ -121,7 +121,6 @@ clean:
 endif

 Makefile.linux:
-	g++ -o /dev/null src/testfeatures.c -L$(LIBDIR) -lfmod-3.75
-	@if [ "0" = "$$?" ]; then echo 'FMOD=-DWITH_FMOD'; else echo 'FMOD=-DWITHOUT_FMOD'; fi > $@
+	g++ -o /dev/null src/testfeatures.c -L$(LIBDIR) -lfmod-3.75 > /dev/null 2>&1 ; if [ "0" = "$$?" ]; then echo 'FMOD=-DWITH_FMOD'; else echo 'FMOD=-DWITHOUT_FMOD'; fi > $@

 -include Makefile.$(TARGET_ARCHITECTURE)
--- a/JGE/src/testfeatures.c
+++ b/JGE/src/testfeatures.c
@@ -1 +1,2 @@
-int main() {}
+void FSOUND_Close();
+int main() { FSOUND_Close(); }
--- a/projects/mtg/Makefile
+++ b/projects/mtg/Makefile
@@ -99,8 +99,7 @@ Makefile.psp:
 	echo > Makefile.psp

 Makefile.linux:
-	g++ -o /dev/null src/testfeatures.c $(LIBDIR) -lfmod-3.75
-	@if [ "0" = "$$?" ]; then echo 'FMOD=-lfmod-3.75'; else echo 'FMOD='; fi > $@
+	g++ -o /dev/null src/testfeatures.c $(LIBDIR) -lfmod-3.75 > /dev/null 2>&1 ; if [ "0" = "$$?" ]; then echo 'FMOD=-lfmod-3.75'; else echo 'FMOD='; fi > $@

 -include $(DEPS)
 -include Makefile.$(TARGET_ARCHITECTURE)
--- a/projects/mtg/src/testfeatures.c
+++ b/projects/mtg/src/testfeatures.c
@@ -1 +1,2 @@
-int main() {}
+void FSOUND_Close();
+int main() { FSOUND_Close(); }