Changeset 840Tweet

Timestamp:

Aug 20, 2011, 11:28:53 PM (12 years ago)

Author:

sam

Message:

ps3: add a build-ps3 script that uses autoconf and automake.

Location:

trunk

Files:

• build-ps3 (added)
• configure.ac (modified) (5 diffs)
• deushax/Makefile.am (modified) (1 diff)
• deushax/debugsprite.cpp (modified) (1 diff)
• monsterz/Makefile.am (modified) (1 diff)
• monsterz/ps3/Makefile (deleted)
• src/ps3app.cpp (modified) (1 diff)
• src/sdlinput.cpp (modified) (5 diffs)

trunk/configure.ac

@@ -70 +70 @@
 fi
 
+dnl No exceptions
+CXXFLAGS="${CXXFLAGS} -fno-exceptions"
 dnl Optimizations
 CXXFLAGS="${CXXFLAGS} ${REL} ${OPT}"
@@ -76 +78 @@
 
 AC_CHECK_LIB(m, sin, MATH_LIBS="${MATH_LIBS} -lm")
+
+
+dnl Are we on the PS3?
+AC_CHECK_LIB(sysmodule_stub, cellSysmoduleLoadModule,
+ [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
+  GL_LIBS="${GL_LIBS} -lPSGL -lgcm_cmd -lgcm_sys_stub"
+  if test "x${enable_debug}" = xyes; then
+    GL_LIBS="${GL_LIBS} -L${CELL_SDK}/target/ppu/lib/PSGL/RSX/debug"
+  elif test "x${enable_release}" = xyes; then
+    GL_LIBS="${GL_LIBS} -L${CELL_SDK}/target/ppu/lib/PSGL/RSX/ultra-opt"
+  else
+    GL_LIBS="${GL_LIBS} -L${CELL_SDK}/target/ppu/lib/PSGL/RSX/opt"
+  fi
+  dnl  For the runtime Cg compiler
+  GL_LIBS="${GL_LIBS} -lcgc -lPSGLcgc"
+  dnl  For the PNG decoder
+  LOL_LIBS="${LOL_LIBS} -lpngdec_stub"
+  dnl  For the pad library
+  LOL_LIBS="${LOL_LIBS} -lio_stub -lusbd_stub -lpadfilter"
+  AC_PATH_PROG(MAKE_FSELF, make_fself, no)
+  AM_CONDITIONAL(USE_MAKE_FSELF, test "${MAKE_FSELF}" != "no")])
+
 
 dnl Which version of OpenGL to use?
@@ -96 +122 @@
    [glLoadIdentity();],
    [ac_cv_my_have_gl="yes"
-    AC_DEFINE(HAVE_GL_2X, 1, Define to 1 if GL 2.x is available) # FIXME: hacky
+    AC_DEFINE(HAVE_GL_2X, 1, Define to 1 if GL 2.x is available) # FIXME: hack
     AC_MSG_RESULT(yes)
     GL_LIBS="-lopengl32"],
    [AC_MSG_RESULT(no)])
   LIBS="$LIBS_save"])
+AC_CHECK_HEADER(PSGL/psgl.h,
+ [ac_cv_my_have_gl="yes"])
 if test "${ac_cv_my_have_gl}" = "no"; then
   AC_MSG_ERROR([[No OpenGL or OpenGL ES implementation found]])
@@ -136 +164 @@
 LIBS="${save_LIBS}"
 
-dnl Use SDL? (always required)
+dnl Use SDL? (always required on Linux or Win32)
 ac_cv_my_have_sdl="yes"
 AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
-if test "${SDL_CONFIG}" != "no"; then
+if test "${SDL_CONFIG}" != "no" -a "x$cross_compiling" != xyes; then
   SDL_CFLAGS="${SDL_CFLAGS} `sdl-config --cflags`"
   SDL_LIBS="${SDL_LIBS} `sdl-config --libs`"
@@ -160 +188 @@
 CPPFLAGS="${save_CPPFLAGS}"
 if test "${ac_cv_my_have_sdl}" = "no"; then
-  AC_MSG_ERROR([[One of SDL, SDL_Image or SDL_Mixer not found]])
+  AC_MSG_WARN([[One of SDL, SDL_Image or SDL_Mixer not found]])
 else
   AC_DEFINE(USE_SDL, 1, Define to 1 to use SDL)

trunk/deushax/Makefile.am

@@ -10 +10 @@
 deushax_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
 deushax_DEPENDENCIES = $(top_builddir)/src/liblol.a
+
+if USE_MAKE_FSELF
+all-local: deushax$(EXEEXT)
+        make_fself deushax$(EXEEXT) deushax.self
+clean-local:
+        rm -f deushax.self
+endif
 
 if USE_GTKGL

trunk/deushax/debugsprite.cpp

@@ -12 +12 @@
 #include "core.h"
 
+using namespace std;
 using namespace lol;
 

trunk/monsterz/Makefile.am

@@ -10 +10 @@
 monsterz_LDFLAGS = $(top_builddir)/src/liblol.a @LOL_LIBS@ @PIPI_LIBS@
 monsterz_DEPENDENCIES = $(top_builddir)/src/liblol.a
+
+if USE_MAKE_FSELF
+all-local: monsterz$(EXEEXT)
+        make_fself monsterz$(EXEEXT) monsterz.self
+clean-local:
+        rm -f monsterz.self
+endif
 
 EXTRA_DIST = $(PNG) $(WAV)

trunk/src/ps3app.cpp

@@ -95 +95 @@
     PSGLcontext *ctx = psglCreateContext();
     psglMakeCurrent(ctx, psgl);
-    psglLoadShaderLibrary(REMOTE_PATH "/shaders.bin");
+    /* TODO: load our shaders when we actually ship them */
+    //psglLoadShaderLibrary("/shaders.bin");
     psglResetCurrentContext();
 

trunk/src/sdlinput.cpp

@@ -13 +13 @@
 #endif
 
-#include <SDL.h>
+#if defined USE_SDL
+#   include <SDL.h>
+#endif
 
 #include "core.h"
@@ -40 +42 @@
   : data(new SdlInputData())
 {
+#if defined USE_SDL
     SDL_Init(SDL_INIT_TIMER);
 
     gamegroup = GAMEGROUP_BEFORE;
+#endif
 }
 
 void SdlInput::TickGame(float deltams)
 {
+#if defined USE_SDL
     Entity::TickGame(deltams);
 
@@ -89 +94 @@
             Input::KeyPressed(i, deltams);
 #endif
+#endif
 }
 
@@ -100 +106 @@
     vec2i ret(-1, -1);
 
+#if defined USE_SDL
     if (SDL_GetAppState() & SDL_APPMOUSEFOCUS)
     {
@@ -105 +112 @@
         ret.y = Video::GetSize().y - 1 - ret.y;
     }
+#endif
     return ret;
 }