--- a/Makefile.in Thu Mar 15 19:33:07 2007 +0000
+++ b/Makefile.in Thu Mar 15 21:46:24 2007 +0000
@@ -35,7 +35,7 @@
RES := $(shell if ! [ -f $(CONFIG_CACHE_SOURCE_LIST) ] || [ -n "`cmp $(CONFIG_CACHE_SOURCE_LIST) $(SOURCE_LIST)`" ]; then cp $(SOURCE_LIST) $(CONFIG_CACHE_SOURCE_LIST); fi )
-all: config.cache squirrel
+all: config.cache
@for dir in $(DIRS); do \
$(MAKE) -C $$dir all; \
done
@@ -71,7 +71,6 @@
@for dir in $(DIRS); do \
$(MAKE) -C $$dir clean; \
done
- $(MAKE) -C 3rdparty/squirrel clean
$(Q)rm -rf $(BUNDLE_TARGET)
lang:
@@ -79,9 +78,6 @@
$(MAKE) -C $$dir all; \
done
-squirrel:
- $(MAKE) -C 3rdparty/squirrel $(SQUIRREL_MAKE_FLAG)
-
mrproper:
@for dir in $(DIRS); do \
$(MAKE) -C $$dir mrproper; \
--- a/config.lib Thu Mar 15 19:33:07 2007 +0000
+++ b/config.lib Thu Mar 15 21:46:24 2007 +0000
@@ -467,9 +467,6 @@
detect_pspconfig
detect_libtimidity
- squirrel_root="$ROOT_DIR/3rdparty/squirrel"
- squirrel_libs="$squirrel_root/lib/libsquirrel.a $squirrel_root/lib/libsqstdlib.a"
-
if [ "$with_direct_music" = "1" ] || [ "$with_direct_music" = "2" ]; then
if [ "$os" != "MINGW" ] && [ "$os" != "CYGWIN" ]; then
if [ "$with_direct_music" = "2" ]; then
@@ -787,14 +784,11 @@
CFLAGS="$CFLAGS -DWITH_ZLIB"
fi
- LIBS="$LIBS $squirrel_libs"
- CFLAGS="$CFLAGS -DWITH_SQUIRREL -I$squirrel_root/include"
- squirrel_make_flag=""
# 64bit machines need -D_SQ64
if [ "$cpu_type" = "64" ]; then
CFLAGS="$CFLAGS -D_SQ64"
- squirrel_make_flag="sq64"
fi
+ CFLAGS="$CFLAGS -I$ROOT_DIR/src/3rdparty/squirrel/include"
if [ -n "$png_config" ]; then
CFLAGS="$CFLAGS -DWITH_PNG"
@@ -1900,7 +1894,6 @@
s#!!REVISION!!#$revision#g;
s#!!AWK!!#$awk#g;
s#!!ENABLE_INSTALL!!#$enable_install#g;
- s#!!SQUIRREL_MAKE_FLAG!!#$squirrel_make_flag#g;
"
}
--- a/source.list Thu Mar 15 19:33:07 2007 +0000
+++ b/source.list Thu Mar 15 21:46:24 2007 +0000
@@ -269,6 +269,28 @@
table/unmovable_land.h
table/water_land.h
+# Squirrel
+3rdparty/squirrel/squirrel/sqapi.cpp
+3rdparty/squirrel/squirrel/sqbaselib.cpp
+3rdparty/squirrel/squirrel/sqclass.cpp
+3rdparty/squirrel/squirrel/sqcompiler.cpp
+3rdparty/squirrel/squirrel/sqdebug.cpp
+3rdparty/squirrel/squirrel/sqfuncstate.cpp
+3rdparty/squirrel/squirrel/sqlexer.cpp
+3rdparty/squirrel/squirrel/sqmem.cpp
+3rdparty/squirrel/squirrel/sqobject.cpp
+3rdparty/squirrel/squirrel/sqstate.cpp
+3rdparty/squirrel/squirrel/sqtable.cpp
+3rdparty/squirrel/squirrel/sqvm.cpp
+3rdparty/squirrel/sqstdlib/sqstdaux.cpp
+3rdparty/squirrel/sqstdlib/sqstdblob.cpp
+3rdparty/squirrel/sqstdlib/sqstdio.cpp
+3rdparty/squirrel/sqstdlib/sqstdmath.cpp
+3rdparty/squirrel/sqstdlib/sqstdrex.cpp
+3rdparty/squirrel/sqstdlib/sqstdstream.cpp
+3rdparty/squirrel/sqstdlib/sqstdstring.cpp
+3rdparty/squirrel/sqstdlib/sqstdsystem.cpp
+
# AI Headers
ai/core/ai.h
ai/core/ai_base.hpp