re #30: update jam config to reflect new all in workspace setup

tim@5f1bb9e6-f381-11dc-ac94-59e6f598b727 · tim@5f1bb9e6-f381-11dc-ac94-59e6f598b727 · commit c49a6b131c44 · 2009-06-14T13:51:46.000Z
diff --git a/Jamconfig b/Jamconfig
@@ -47,24 +47,22 @@ COMPILER.C++FLAGS += -fvisibility-inlines-hidden ;
 COMPILER.CFLAGS += -fvisibility=hidden ;
 COMPILER.CFLAGS.VISIBILITY_DEFAULT ?= -fvisibility=default ;
 
-PS.DEV.DIR ?= /media/devdisk/phd/development/planeshift ;
-
 CRYSTAL.AVAILABLE ?= yes ;
 CRYSTAL.VERSION ?= 1.4 ;
-CRYSTAL.CFLAGS ?= -I$(PS.DEV.DIR)/cs/include ;
-CRYSTAL.LFLAGS ?= -L$(PS.DEV.DIR)/cs/out/linux/optimize/libs -lcrystalspace-1.4 -lz -lpthread -lc -lm -ldl -lnsl -L/usr/local/lib ;
-CRYSTAL.INCLUDE_DIR ?= $(PS.DEV.DIR)/cs/include ;
+CRYSTAL.CFLAGS ?= -I$(PS.DEV.DIR)/CrystalSpace/include ;
+CRYSTAL.LFLAGS ?= -L$(PS.DEV.DIR)/CrystalSpace/out/linuxx86/optimize/libs -lcrystalspace-1.4 -lz -lpthread -lc -lm -ldl -lnsl -L/usr/local/lib ;
+CRYSTAL.INCLUDE_DIR ?= $(PS.DEV.DIR)/CrystalSpace/include ;
 CRYSTAL.AVAILABLE_LIBS ?= crystalspace crystalspace_opengl ;
-CRYSTAL.STATICDEPS ?= $(PS.DEV.DIR)/cs/out/linux/optimize/libs/crystalspace_staticplugins.jam ;
+CRYSTAL.STATICDEPS ?= $(PS.DEV.DIR)/CrystalSpace/out/linuxx86/optimize/libs/crystalspace_staticplugins.jam ;
 
 CAL3D.AVAILABLE ?= yes ;
-CAL3D.CFLAGS ?= -I$(PS.DEV.DIR)/cal3d/src ;
-CAL3D.LFLAGS ?= -L$(PS.DEV.DIR)/cal3d/src/cal3d/.libs -lcal3d -lz -lpthread -lc -lm -ldl -lnsl -L/usr/local/lib ;
-CAL3D.INCLUDE_DIR ?= $(PS.DEV.DIR)/cal3d/src ;
+CAL3D.CFLAGS ?= -I$(PS.DEV.DIR)/Cal3d/src ;
+CAL3D.LFLAGS ?= -L$(PS.DEV.DIR)/Cal3d/src/cal3d/.libs -lcal3d -lz -lpthread -lc -lm -ldl -lnsl -L/usr/local/lib ;
+CAL3D.INCLUDE_DIR ?= $(PS.DEV.DIR)/Cal3d/src ;
 
 PS.VERSION ?= 0.4 ;
-PS.INCLUDES ?= -I$(PS.DEV.DIR)/workspace-psai/PlaneShift/include -I$(PS.DEV.DIR)/workspace-psai/PlaneShift/src/client -I$(PS.DEV.DIR)/workspace-psai/PlaneShift/src/common -I$(PS.DEV.DIR)/workspace-psai/PlaneShift/src/eedit -I$(PS.DEV.DIR)/workspace-psai/PlaneShift/src/npcclient -I$(PS.DEV.DIR)/workspace-psai/PlaneShift/src/pslaunch -I$(PS.DEV.DIR)/workspace-psai/PlaneShift/src/server -I$(PS.DEV.DIR)/workspace-psai/PlaneShift/src/setup -I$(PS.DEV.DIR)/workspace-psai/PlaneShift/src/tools ;
-PS.LIB_DIR ?= $(PS.DEV.DIR)/workspace-psai/PlaneShift/out/linux/optimize/libs ;
+PS.INCLUDES ?= -I$(PS.DEV.DIR)/PlaneShift/include -I$(PS.DEV.DIR)/PlaneShift/src/client -I$(PS.DEV.DIR)/PlaneShift/src/common -I$(PS.DEV.DIR)/PlaneShift/src/eedit -I$(PS.DEV.DIR)/PlaneShift/src/npcclient -I$(PS.DEV.DIR)/PlaneShift/src/pslaunch -I$(PS.DEV.DIR)/PlaneShift/src/server -I$(PS.DEV.DIR)/PlaneShift/src/setup -I$(PS.DEV.DIR)/PlaneShift/src/tools ;
+PS.LIB_DIR ?= $(PS.DEV.DIR)/PlaneShift/out/linuxx86/optimize/libs ;
 
 PSENGINE.AVAILABLE ?= yes ;
 PSENGINE.CFLAGS ?= $(PS.INCLUDES) ;
diff --git a/Jamfile b/Jamfile
@@ -17,8 +17,9 @@ IncludeDir tests ;
 IncludeDir tests xml ;
 
 # other library includes
-IncludeDir $(TOP) .. .. cal3d src ;
-IncludeDir $(TOP) .. .. cs include ;
+IncludeDir $(TOP) .. Cal3d src ;
+IncludeDir $(TOP) .. Cal3d include ;
+IncludeDir $(TOP) .. CrystalSpace include ;
 
 # PlaneShift include directories
 IncludeDir $(TOP) .. PlaneShift include ;
@@ -66,7 +67,7 @@ Help distclean : "Remove built targets and configuration" ;
 
 RegisterCompileGroups psailib tests ;
 
-# List the first layer of subdirectories containing the jamfiles for the projects you wish to compile. This is order sensistive.
+# List the first layer of subdirectories containing the jamfiles for the projects you wish to compile. This is order sensitive.
 # Library targets must be seen by Jam before Application and Plugin targets.
 
 SubInclude TOP src ;
