compilation of BulletSPUOptimized

[mojo]

hello,

following patch has to be applied in order to compile point 3 in the BulletSpuOptimized document.
if you find the fix correct, you could commit the change in your repository, please.

thanks,
Mojmir

/trunk/Demos/CcdPhysicsDemo/ibmsdk/Makefile

Code: Select all

--- Makefile    2008-02-18 13:43:03.000000000 +0100
+++ new/Makefile        2008-02-18 13:43:03.000000000 +0100
@@ -28,20 +28,11 @@ OBJS                = CcdPhysicsDemo.o main.o

 IBM_CELLSDK_VERSION := $(shell if [ -d /opt/cell ]; then echo "3.0"; fi)

-ifeq ("$(IBM_CELLSDK_VERSION)","3.0")
-        CELL_TOP ?= /opt/cell/sdk
-       CELL_SYSROOT = /opt/cell/sysroot
-        include $(CELL_TOP)/buildutils/make.footer
-else
-        CELL_TOP ?= /opt/ibm/cell-sdk/prototype
-       CELL_SYSROOT = $(CELL_TOP)/sysroot
-        include $(CELL_TOP)/make.footer
-endif

 ########################################################################
 #                       Libraries, Include paths,  Defines
 ########################################################################
-INCLUDE                =       -DUSE_LIBSPE2                           \
+INCLUDE=-DUSE_LIBSPE2 \
                        -I$(CELL_SYSROOT)/usr/include   \
                        -I../                   \
                        -I$(ROOT)/src           \
@@ -64,6 +55,16 @@ INSTALL_FILES   = $(PROGRAM_ppu)
 #                       make.footer
 ########################################################################

+ifeq ("$(IBM_CELLSDK_VERSION)","3.0")
+        CELL_TOP ?= /opt/cell/sdk
+       CELL_SYSROOT = /opt/cell/sysroot
+        include $(CELL_TOP)/buildutils/make.footer
+else
+        CELL_TOP ?= /opt/ibm/cell-sdk/prototype
+       CELL_SYSROOT = $(CELL_TOP)/sysroot
+        include $(CELL_TOP)/make.footer
+endif
+


 $(PPMS):

[Joczhen]

Hi Mojmir,

thanks for posting this patch. The patch looks good so far.
I had the same problem if I remember correctly. I think I sent a patch after the 2-66 release. So it should be in the svn repository if the patch got accepted (never cross-checked that).
The problem was that INCLUDES wasn't defined at the time the make.footer was included, right?

I'll have a look tomorrow morning whether it is in or not. I'll let you know.

--
Jochen

[Joczhen]

OK, I just verified that the patch I sent isn't in the svn repository.
And it actually addresses exactly the same problem.

Erwin, can you please accept that patch?
I'll send you my top-level ibmsdk Makefile again.

Thanks