Changeset 1563Tweet

Timestamp:

Jul 2, 2012, 12:58:30 PM (9 years ago)

Author:

sam

Message:

build: do like BulletPhysics and make the PS3 code always visible.

Location:

trunk

Files:

• configure.ac (modified) (3 diffs)
• src/Makefile.am (modified) (2 diffs)

trunk/configure.ac

@@ -44 +44 @@
 AC_EGREP_CPP(yes, foo)
 PKG_PROG_PKG_CONFIG()
-
-dnl  Available platforms: some of these are not public
-AM_CONDITIONAL(HAVE_PS3, test -f src/platform/ps3/ps3app.cpp)
-AM_CONDITIONAL(HAVE_XBOX, false)
 
 AM_CONDITIONAL(USE_GLEW, test "${ac_cv_my_have_glew}" != "no")
@@ -95 +91 @@
 
 dnl Are we on the PS3?
+ac_cv_my_have_ps3="no"
 AC_CHECK_LIB(sysmodule_stub, cellSysmoduleLoadModule,
- [LOL_LIBS="${LOL_LIBS} -lsysmodule_stub -lsysutil_stub -lresc_stub"
+ [ac_cv_my_have_ps3="yes"
+  LOL_LIBS="${LOL_LIBS} -lsysmodule_stub -lsysutil_stub -lresc_stub"
   dnl  For PSGL
   AC_DEFINE(HAVE_GLES_2X, 1, Define to 1 if GLES 2.x is available) # FIXME: hack
@@ -122 +120 @@
  [MAKE_FSELF=no])
 AM_CONDITIONAL(USE_MAKE_FSELF, test "${MAKE_FSELF}" != "no")
+AM_CONDITIONAL(USE_PS3, test "${ac_cv_my_have_ps3}" != "no")
+
+
+dnl  Are we on the Xbox 360?
+dnl  Answer: NO! we don't know how to build for it anyway
+AM_CONDITIONAL(USE_X360, false)
 
 

trunk/src/Makefile.am

@@ -96 +96 @@
 endif
 
-if HAVE_PS3
+if USE_PS3
 ps3_sources = \
     image/codec/ps3-image.cpp \
@@ -104 +104 @@
 endif
 
-if HAVE_XBOX
+if USE_X360
 xbox_sources = \
     platform/xbox/xboxapp.cpp platform/xbox/xboxapp.h \