+++ /dev/null
-Author: Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
-Purpose: Makes squirrel buildable and installable using autotools, a buildsystem everybody is comfortable with.
-Source: http://ohnopub.net/hg/SQUIRREL2
-Generate with: hg diff -r 0 -r -1 -I '**Makefile*' -I configure.ac -I '**.in'
-
-diff -r d6d89bbc08e5 -r c89309f5be40 Makefile
---- a/Makefile Thu Feb 11 15:08:35 2010 -0500
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,18 +0,0 @@
--\r
--SQUIRREL=.\r
--MAKE=make\r
--\r
--sq32:\r
-- cd squirrel; $(MAKE) \r
-- cd sqstdlib; $(MAKE) \r
-- cd sq; $(MAKE) \r
--\r
--sqprof:\r
-- cd squirrel; $(MAKE) sqprof\r
-- cd sqstdlib; $(MAKE) sqprof\r
-- cd sq; $(MAKE) sqprof\r
--\r
--sq64:\r
-- cd squirrel; $(MAKE) sq64\r
-- cd sqstdlib; $(MAKE) sq64\r
-- cd sq; $(MAKE) sq64\r
-diff -r d6d89bbc08e5 -r c89309f5be40 Makefile.am
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/Makefile.am Sat Apr 10 11:25:40 2010 -0400
-@@ -0,0 +1,89 @@
-+# autoreconf variables, recommended by libtoolize
-+ACLOCAL_FLAGS = -I m4
-+
-+AM_CPPFLAGS = -I$(top_srcdir)/include
-+
-+# custom installation directories
-+examplesdir = $(docdir)/examples
-+pkgconfigdir = $(libdir)/pkgconfig
-+
-+# installed things
-+if ENABLE_DOC
-+dist_doc_DATA = doc/sqstdlib2.pdf \
-+ doc/squirrel2.pdf
-+endif
-+if ENABLE_EXAMPLES
-+dist_examples_DATA = samples/ackermann.nut \
-+ samples/array.nut \
-+ samples/class.nut \
-+ samples/classattributes.nut \
-+ samples/coroutines.nut \
-+ samples/delegation.nut \
-+ samples/fibonacci.nut \
-+ samples/flow.nut \
-+ samples/generators.nut \
-+ samples/hello.nut \
-+ samples/list.nut \
-+ samples/loops.nut \
-+ samples/matrix.nut \
-+ samples/metamethods.nut \
-+ samples/methcall.nut \
-+ samples/tailstate.nut
-+endif
-+
-+nodist_pkgconfig_DATA = libsqstdlib.pc \
-+ libsquirrel.pc
-+bin_PROGRAMS = sq/sq
-+lib_LTLIBRARIES = libsquirrel.la \
-+ libsqstdlib.la
-+include_HEADERS = include/sqstdaux.h \
-+ include/sqstdblob.h \
-+ include/sqstdio.h \
-+ include/sqstdmath.h \
-+ include/sqstdstring.h \
-+ include/sqstdsystem.h \
-+ include/squirrel.h
-+
-+
-+# sources for installed things
-+
-+libsqstdlib_la_SOURCES = sqstdlib/sqstdaux.cpp \
-+ sqstdlib/sqstdblob.cpp sqstdlib/sqstdblobimpl.h \
-+ sqstdlib/sqstdio.cpp \
-+ sqstdlib/sqstdmath.cpp \
-+ sqstdlib/sqstdrex.cpp \
-+ sqstdlib/sqstdstream.cpp sqstdlib/sqstdstream.h \
-+ sqstdlib/sqstdstring.cpp \
-+ sqstdlib/sqstdsystem.cpp
-+libsqstdlib_la_LDFLAGS = -version-info 0:0:0
-+libsqstdlib_la_LIBADD = libsquirrel.la
-+
-+libsquirrel_la_SOURCES = squirrel/sqapi.cpp \
-+ squirrel/sqarray.h \
-+ squirrel/sqbaselib.cpp \
-+ squirrel/sqclass.cpp squirrel/sqclass.h \
-+ squirrel/sqclosure.h \
-+ squirrel/sqcompiler.cpp squirrel/sqcompiler.h \
-+ squirrel/sqdebug.cpp \
-+ squirrel/sqfuncproto.h \
-+ squirrel/sqfuncstate.cpp squirrel/sqfuncstate.h \
-+ squirrel/sqlexer.cpp squirrel/sqlexer.h \
-+ squirrel/sqmem.cpp \
-+ squirrel/sqobject.cpp squirrel/sqobject.h \
-+ squirrel/sqopcodes.h \
-+ squirrel/sqpcheader.h \
-+ squirrel/sqstate.cpp squirrel/sqstate.h \
-+ squirrel/sqstring.h \
-+ squirrel/sqtable.cpp squirrel/sqtable.h \
-+ squirrel/squserdata.h \
-+ squirrel/squtils.h \
-+ squirrel/sqvm.cpp squirrel/sqvm.h
-+libsquirrel_la_LDFLAGS = -version-info 0:0:0
-+
-+sq_sq_SOURCES = sq/sq.c
-+sq_sq_LDADD = libsqstdlib.la
-+
-+EXTRA_DIST = COMPILE COPYRIGHT HISTORY README \
-+ doc/sqstdlib2.chm doc/squirrel2.chm \
-+ squirrel.dsw sq/sq.dsp squirrel/squirrel.dsp sqstdlib/sqstdlib.dsp \
-+ etc/minimal.c etc/test.nut
-diff -r d6d89bbc08e5 -r c89309f5be40 configure.ac
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/configure.ac Sat Apr 10 11:25:40 2010 -0400
-@@ -0,0 +1,29 @@
-+AC_INIT([squirrel],[2.2.4],[http://squirrel-lang.org/])
-+
-+# recommended by libtoolize:
-+AC_CONFIG_MACRO_DIR([m4])
-+
-+AM_INIT_AUTOMAKE([foreign dist-bzip2 subdir-objects])
-+
-+AC_PROG_LIBTOOL
-+AC_PROG_CC_C_O
-+AC_PROG_CXX
-+
-+AC_ARG_ENABLE([doc],
-+ [AS_HELP_STRING([--disable-doc], [Control whether or not the API docs (pdfs) are installed.])],
-+ [enable_docs=$enableval],
-+ [enable_docs=yes])
-+AM_CONDITIONAL([ENABLE_DOC],
-+ [test "x$enable_docs" = "xyes"])
-+
-+AC_ARG_ENABLE([examples],
-+ [AS_HELP_STRING([--disable-exampels], [Control whether or not examples of libsquirrel use are installed.])],
-+ [enable_examples=$enableval],
-+ [enable_examples=yes])
-+AM_CONDITIONAL([ENABLE_EXAMPLES],
-+ [test "x$enable_examples" = "xyes"])
-+
-+AC_CONFIG_FILES([Makefile
-+libsquirrel.pc
-+libsqstdlib.pc])
-+AC_OUTPUT
-diff -r d6d89bbc08e5 -r c89309f5be40 libsqstdlib.pc.in
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/libsqstdlib.pc.in Sat Apr 10 11:25:40 2010 -0400
-@@ -0,0 +1,14 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE_NAME@
-+Description: A library for libsquirrel users
-+Version: @VERSION@
-+URL: @PACKAGE_BUGREPORT@
-+Libs: -L${libdir} -lsqstdlib
-+# I don't like hard-coding this here, but it's an internal
-+# dependency so it's justified.
-+Libs.private: -lsquirrel
-+Cflags: -I${includedir}
-diff -r d6d89bbc08e5 -r c89309f5be40 libsquirrel.pc.in
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/libsquirrel.pc.in Sat Apr 10 11:25:40 2010 -0400
-@@ -0,0 +1,11 @@
-+prefix=@prefix@
-+exec_prefix=@exec_prefix@
-+libdir=@libdir@
-+includedir=@includedir@
-+
-+Name: @PACKAGE_NAME@
-+Description: A dynamic scripting language for games
-+Version: @VERSION@
-+URL: @PACKAGE_BUGREPORT@
-+Libs: -L${libdir} -lsquirrel
-+Cflags: -I${includedir}
-diff -r d6d89bbc08e5 -r c89309f5be40 sq/Makefile
---- a/sq/Makefile Thu Feb 11 15:08:35 2010 -0500
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,21 +0,0 @@
--SQUIRREL= ..\r
--\r
--\r
--OUT= $(SQUIRREL)/bin/sq\r
--INCZ= -I$(SQUIRREL)/include -I. -I$(SQUIRREL)/sqlibs\r
--LIBZ= -L$(SQUIRREL)/lib \r
--LIB= -lsquirrel -lsqstdlib\r
--\r
--OBJS= sq.o\r
-- \r
--SRCS= sq.c\r
-- \r
-- \r
--sq32:\r
-- g++ -O2 -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)\r
--\r
--sqprof:\r
-- g++ -O2 -pg -fno-rtti -pie -gstabs -g3 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)\r
-- \r
--sq64:\r
-- g++ -O2 -fno-rtti -D_SQ64 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
-\ No newline at end of file
-diff -r d6d89bbc08e5 -r c89309f5be40 sqstdlib/Makefile
---- a/sqstdlib/Makefile Thu Feb 11 15:08:35 2010 -0500
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,30 +0,0 @@
--SQUIRREL= ..\r
--\r
--\r
--OUT= $(SQUIRREL)/lib/libsqstdlib.a\r
--INCZ= -I$(SQUIRREL)/include -I. -Iinclude\r
--\r
--SRCS= \\r
-- sqstdblob.cpp \\r
-- sqstdio.cpp \\r
-- sqstdstream.cpp \\r
-- sqstdmath.cpp \\r
-- sqstdsystem.cpp \\r
-- sqstdstring.cpp \\r
-- sqstdaux.cpp \\r
-- sqstdrex.cpp\r
-- \r
-- \r
--sq32:\r
-- gcc -O2 -fno-rtti -Wall -c $(SRCS) $(INCZ)\r
-- ar rc $(OUT) *.o\r
-- rm *.o\r
--\r
--sqprof:\r
-- gcc -O2 -pg -fno-rtti -pie -gstabs -g3 -Wall -c $(SRCS) $(INCZ)\r
-- ar rc $(OUT) *.o\r
-- rm *.o\r
--sq64:\r
-- gcc -O2 -D_SQ64 -fno-rtti -Wall -c $(SRCS) $(INCZ)\r
-- ar rc $(OUT) *.o\r
-- rm *.o\r
-diff -r d6d89bbc08e5 -r c89309f5be40 squirrel/Makefile
---- a/squirrel/Makefile Thu Feb 11 15:08:35 2010 -0500
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,52 +0,0 @@
--SQUIRREL= ..\r
--\r
--\r
--OUT= $(SQUIRREL)/lib/libsquirrel.a\r
--INCZ= -I$(SQUIRREL)/include -I. -Iinclude\r
--DEFS= \r
--LIB= \r
--\r
--OBJS= \\r
-- sqapi.o \\r
-- sqbaselib.o \\r
-- sqcompiler.o \\r
-- sqdebug.o \\r
-- sqlexer.o \\r
-- sqobject.o \\r
-- sqparser.o \\r
-- sqstate.o \\r
-- sqtable.o \\r
-- sqvm.o \\r
-- sqmem.o \\r
-- sqclass.o\r
-- \r
--SRCS= \\r
-- sqapi.cpp \\r
-- sqbaselib.cpp \\r
-- sqfuncstate.cpp \\r
-- sqdebug.cpp \\r
-- sqlexer.cpp \\r
-- sqobject.cpp \\r
-- sqcompiler.cpp \\r
-- sqstate.cpp \\r
-- sqtable.cpp \\r
-- sqmem.cpp \\r
-- sqvm.cpp \\r
-- sqclass.cpp\r
--\r
-- \r
-- \r
--sq32:\r
-- gcc -O2 -fno-rtti -Wall -c $(SRCS) $(INCZ) $(DEFS)\r
-- ar rc $(OUT) *.o\r
-- rm *.o\r
--\r
--sqprof:\r
-- gcc -O2 -pg -fno-rtti -pie -gstabs -g3 -Wall -c $(SRCS) $(INCZ) $(DEFS)\r
-- ar rc $(OUT) *.o\r
-- rm *.o\r
--\r
--sq64:\r
-- gcc -O2 -D_SQ64 -fno-rtti -Wall -c $(SRCS) $(INCZ) $(DEFS)\r
-- ar rc $(OUT) *.o\r
-- rm *.o\r
+++ /dev/null
-From fd2d422f16ca1134f3be8d693290e6b1c536bf71 Mon Sep 17 00:00:00 2001
-From: Sergei Trofimovich <slyfox@gentoo.org>
-Date: Thu, 7 Jun 2012 10:10:28 +0300
-Subject: [squirrel: PATCH] fix build breakage on gcc-4.7 and clang++
-
-gcc 4.7 got proper support for argument dependent lookup
-for builtin types:
- http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46075
-
-It exposed old problem:
-> gcc -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c sqapi.cpp sqbaselib.cpp sqfuncstate.cpp sqdebug.cpp \
- sqlexer.cpp sqobject.cpp sqcompiler.cpp sqstate.cpp sqtable.cpp sqmem.cpp sqvm.cpp sqclass.cpp -I../include -I. -Iinclude
- In file included from sqobject.h:5:0,
- from sqpcheader.h:16,
- from sqapi.cpp:4:
- squtils.h: In instantiation of 'sqvector<T>::~sqvector() [with T = long long int]':
- sqclosure.h:142:52: required from here
- squtils.h:46:4: error: 'sq_vm_free' was not declared in this scope, and no declarations were found by argument-dependent
- lookup at the point of instantiation [-fpermissive]
- In file included from sqpcheader.h:17:0,
- from sqapi.cpp:4:
- sqstate.h:143:6: note: 'void sq_vm_free(void*, SQUnsignedInteger)' declared here, later in the translation unit
-
-Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
----
- squirrel/sqstate.h | 3 ---
- squirrel/squtils.h | 4 ++++
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/squirrel/sqstate.h b/squirrel/sqstate.h
-index 3ed3307..e931404 100755
---- a/squirrel/sqstate.h
-+++ b/squirrel/sqstate.h
-@@ -138,7 +138,4 @@ private:
- \r
- bool CompileTypemask(SQIntVec &res,const SQChar *typemask);\r
- \r
--void *sq_vm_malloc(SQUnsignedInteger size);\r
--void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);\r
--void sq_vm_free(void *p,SQUnsignedInteger size);\r
- #endif //_SQSTATE_H_\r
-diff --git a/squirrel/squtils.h b/squirrel/squtils.h
-index bff7d24..ac3aef9 100755
---- a/squirrel/squtils.h
-+++ b/squirrel/squtils.h
-@@ -10,6 +10,10 @@
- \r
- #define sq_aligning(v) (((size_t)(v) + (SQ_ALIGNMENT-1)) & (~(SQ_ALIGNMENT-1)))\r
- \r
-+
-+void *sq_vm_malloc(SQUnsignedInteger size);\r
-+void *sq_vm_realloc(void *p,SQUnsignedInteger oldsize,SQUnsignedInteger size);\r
-+void sq_vm_free(void *p,SQUnsignedInteger size);\r
- //sqvector mini vector class, supports objects by value\r
- template<typename T> class sqvector\r
- {\r
---
-1.7.8.6
-
+++ /dev/null
-diff -r d6d89bbc08e5 -r 692b7872324b include/squirrel.h
---- a/include/squirrel.h Thu Feb 11 15:08:35 2010 -0500
-+++ b/include/squirrel.h Sat Feb 13 01:04:21 2010 -0500
-@@ -39,28 +39,22 @@
- #define SQUIRREL_API extern\r
- #endif\r
- \r
--#if (defined(_WIN64) || defined(_LP64))\r
--#define _SQ64\r
--#endif\r
-+/* Get uintptr_t from a non standard or standard location */\r
-+#ifdef _MSC_VER\r
-+#include <stddef.h>\r
- \r
--#ifdef _SQ64\r
--#ifdef _MSC_VER\r
--typedef __int64 SQInteger;\r
--typedef unsigned __int64 SQUnsignedInteger;\r
--typedef unsigned __int64 SQHash; /*should be the same size of a pointer*/\r
--#else\r
--typedef long SQInteger;\r
--typedef unsigned long SQUnsignedInteger;\r
--typedef unsigned long SQHash; /*should be the same size of a pointer*/\r
--#endif\r
--typedef int SQInt32; \r
--#else \r
--typedef int SQInteger;\r
--typedef int SQInt32; /*must be 32 bits(also on 64bits processors)*/\r
--typedef unsigned int SQUnsignedInteger;\r
--typedef unsigned int SQHash; /*should be the same size of a pointer*/\r
--#endif\r
-+typedef __int32 SQInt32;\r
-+typedef __int64 SQInt64;\r
-+#else /* _MSC_VER */\r
-+#include <stdint.h>\r
- \r
-+typedef int32_t SQInt32;\r
-+typedef int64_t SQInt64;\r
-+#endif /* _MSC_VER */\r
-+\r
-+typedef intptr_t SQInteger;\r
-+typedef uintptr_t SQUnsignedInteger;\r
-+typedef uintptr_t SQHash;\r
- \r
- #ifdef SQUSEDOUBLE\r
- typedef double SQFloat;\r
-@@ -68,12 +62,8 @@
- typedef float SQFloat;\r
- #endif\r
- \r
--#if defined(SQUSEDOUBLE) && !defined(_SQ64)\r
--#ifdef _MSC_VER\r
--typedef __int64 SQRawObjectVal; //must be 64bits\r
--#else\r
--typedef long SQRawObjectVal; //must be 64bits\r
--#endif\r
-+#if defined(SQUSEDOUBLE)\r
-+typedef SQInt64 SQRawObjectVal; /* must be 64 bits */\r
- #define SQ_OBJECT_RAWINIT() { _unVal.raw = 0; }\r
- #else\r
- typedef SQUnsignedInteger SQRawObjectVal; //is 32 bits on 32 bits builds and 64 bits otherwise\r
-@@ -453,4 +443,13 @@
- } /*extern "C"*/\r
- #endif\r
- \r
-+/*\r
-+ Define for code which depends on squirrel to\r
-+ determine bitiness. IMO, this should be discouraged.\r
-+ --ohnobinki\r
-+*/\r
-+#if (defined(_WIN64) || defined(_LP64))\r
-+#define _SQ64\r
-+#endif\r
-+\r
- #endif /*_SQUIRREL_H_*/\r
+++ /dev/null
-diff -r 3e8a1ff66c3c -r bd1cfd3e3cdd sqstdlib/sqstdstream.cpp
---- a/sqstdlib/sqstdstream.cpp Fri Feb 12 20:35:23 2010 -0500
-+++ b/sqstdlib/sqstdstream.cpp Fri Feb 12 23:58:35 2010 -0500
-@@ -277,7 +277,7 @@
- sq_pop(v,1);\r
- }\r
- \r
--SQRESULT declare_stream(HSQUIRRELVM v,SQChar* name,SQUserPointer typetag,const SQChar* reg_name,SQRegFunction *methods,SQRegFunction *globals)\r
-+SQRESULT declare_stream(HSQUIRRELVM v,const SQChar* name,SQUserPointer typetag,const SQChar* reg_name,SQRegFunction *methods,SQRegFunction *globals)\r
- {\r
- if(sq_gettype(v,-1) != OT_TABLE)\r
- return sq_throwerror(v,_SC("table expected"));\r
-diff -r 3e8a1ff66c3c -r bd1cfd3e3cdd sqstdlib/sqstdstream.h
---- a/sqstdlib/sqstdstream.h Fri Feb 12 20:35:23 2010 -0500
-+++ b/sqstdlib/sqstdstream.h Fri Feb 12 23:58:35 2010 -0500
-@@ -14,5 +14,5 @@
- SQInteger _stream_flush(HSQUIRRELVM v);\r
- \r
- #define _DECL_STREAM_FUNC(name,nparams,typecheck) {_SC(#name),_stream_##name,nparams,typecheck}\r
--SQRESULT declare_stream(HSQUIRRELVM v,SQChar* name,SQUserPointer typetag,const SQChar* reg_name,SQRegFunction *methods,SQRegFunction *globals);\r
-+SQRESULT declare_stream(HSQUIRRELVM v,const SQChar* name,SQUserPointer typetag,const SQChar* reg_name,SQRegFunction *methods,SQRegFunction *globals);\r
- #endif /*_SQSTD_STREAM_H_*/\r
projects / gentoo.git / commitdiff