Changeset 1036Tweet

Timestamp:

Oct 29, 2011, 8:29:42 PM (11 years ago)

Author:

sam

Message:

build: allow to build without the PS3-specific files.

Location:

trunk

Files:

• bootstrap (modified) (1 diff)
• configure.ac (modified) (1 diff)
• src/Makefile.am (modified) (2 diffs)
• test/math (modified) (1 prop)

trunk/bootstrap

@@ -16 +16 @@
 # Die if an error occurs
 set -e
+
+# LolEngine specific:
+sed -ne '/AC_CONFIG_FILES/,$p' configure.ac \
+  | sed -ne 's/[ \[*]*\([a-z].*\).Makefile.*/\1/p' | while read p; do
+    if [ ! -f "$p/Makefile.am" ]; then
+        echo "bootstrap: $p/Makefile.am does not exist -- creating stub"
+        mkdir -p "$p"
+        echo "# Stub created by bootstrap" > "$p/Makefile.am"
+    fi
+done
 
 # Guess whether we are using configure.ac or configure.in

trunk/configure.ac

@@ -43 +43 @@
 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(USE_GLEW, test "${ac_cv_my_have_glew}" != "no")
 dnl conditional builds
 AC_ARG_ENABLE(debug,

trunk/src/Makefile.am

@@ -18 +18 @@
     eglapp.cpp eglapp.h \
     \
-    platform/sdl/sdlapp.cpp platform/sdl/sdlapp.h \
-    platform/sdl/sdlinput.cpp platform/sdl/sdlinput.h \
-    \
-    platform/ps3/ps3app.cpp platform/ps3/ps3app.h \
-    platform/ps3/ps3input.cpp platform/ps3/ps3input.h \
+    $(ps3_sources) \
+    $(sdl_sources) \
     \
     shader/shader.cpp shader/shader.h \
@@ -40 +37 @@
 liblol_a_CPPFLAGS = @LOL_CFLAGS@
 
+sdl_sources =  \
+    platform/sdl/sdlapp.cpp platform/sdl/sdlapp.h \
+    platform/sdl/sdlinput.cpp platform/sdl/sdlinput.h
+
+if HAVE_PS3
+ps3_sources =  \
+    platform/ps3/ps3app.cpp platform/ps3/ps3app.h \
+    platform/ps3/ps3input.cpp platform/ps3/ps3input.h
+endif
+

trunk/test/math

@@ -2 +2 @@
 Makefile.in
 .deps
+remez
+poly
+pi

@@ -2 +2 @@
 Makefile.in
 .deps
+remez
+poly
+pi

@@ -2 +2 @@
 Makefile.in
 .deps
+remez
+poly
+pi