Updated for Cell SDK 2.0
authorDavid Kunzman <kunzman2@illinois.edu>
Mon, 18 Dec 2006 22:27:28 +0000 (22:27 +0000)
committerDavid Kunzman <kunzman2@illinois.edu>
Mon, 18 Dec 2006 22:27:28 +0000 (22:27 +0000)
src/arch/net-linux-cell/conv-mach.sh
src/arch/net-linux-cell/special.sh

index 5e8a60e90e7a3b2d16a5213369801a5a40eb769a..d8fa821fc7d5c0a4b3fc4c7f6a5ab1efab40af8c 100644 (file)
@@ -1,4 +1,5 @@
-CELL_SDK_DIR="/opt/IBM/cell-sdk-1.1"
+#CELL_SDK_DIR="/opt/IBM/cell-sdk-1.1"
+CELL_SDK_DIR="/opt/ibm/cell-sdk/prototype"
 
 CMK_CPP_CHARM='/usr/lib/cpp'
 CMK_CPP_C='ppu32-gcc -E'
@@ -17,13 +18,15 @@ CMK_SPE_CC="spu-gcc -W -Wall -Winline -Wno-main -Wl,-N -I$CELL_SDK_DIR/sysroot/u
 CMK_SPE_CXX="spu-g++ -W -Wall -Winline -Wno-main -Wl,-N -I$CELL_SDK_DIR/sysroot/usr/spu/include -L$CELL_SDK_DIR/sysroot/usr/spu/lib"
 CMK_SPE_LD="spu-gcc -Wl,-N -L$CELL_SDK_DIR/sysroot/usr/spu/lib"
 CMK_SPE_LDXX="spu-g++ -Wl,-N -L$CELL_SDK_DIR/sysroot/usr/spu/lib"
-CMK_SPERT_LIBS="-lcellspu $CELL_SDK_DIR/sysroot/usr/spu/lib/libc.a $CELL_SDK_DIR/sysroot/usr/spu/lib/libsim.a"
+#CMK_SPERT_LIBS="-lcellspu $CELL_SDK_DIR/sysroot/usr/spu/lib/libc.a $CELL_SDK_DIR/sysroot/usr/spu/lib/libsim.a"
+CMK_SPERT_LIBS="-lcellspu $CELL_SDK_DIR/sysroot/usr/spu/lib/libsim.a"
 CMK_SPE_AR='spu-ar'
 CMK_PPU_EMBEDSPU='ppu32-embedspu'
 
 CMK_RANLIB='ppu-ranlib'
 CMK_AR='ppu-ar -r'
-CMK_LIBS='-lckqt -lcellppu -lspe'
+#CMK_LIBS='-lckqt -lcellppu -lspe'
+CMK_LIBS='-lckqt -lcellppu -lspe2'
 CMK_LD_SHARED='-shared'
 
 CMK_NATIVE_CC='gcc'
index 79ddc1e79e23c1c22086b8adba7d8d3f1d64cb36..4eb8cb34979802088dd3d55354ef9e064054ae2f 100755 (executable)
@@ -12,7 +12,8 @@ done
 #make library
 export CHARMINC=../include
 . ./conv-config.sh
-if test ! -f $CELL_SDK_DIR/sysroot/usr/include/libspe.h
+%if test ! -f $CELL_SDK_DIR/sysroot/usr/include/libspe.h
+if test ! -f $CELL_SDK_DIR/sysroot/usr/include/libspe2.h
 then
   echo "Please define CELL_SDK_DIR in charm/src/arch/net-linux-cell/conv-mach.sh!"
   exit 1