Menu
▾
▴
[Tora-cvs] SF.net SVN: tora:[4307] branches/tora3
|
From: <ibr...@us...> - 2012-05-08 18:03:16
|
Revision: 4307
http://tora.svn.sourceforge.net/tora/?rev=4307&view=rev
Author: ibre5041
Date: 2012-05-08 18:03:05 +0000 (Tue, 08 May 2012)
Log Message:
-----------
Modified Paths:
--------------
branches/tora3/CMakeLists.txt
branches/tora3/extlibs/libantlr3c-3.3/include/antlr3.h
branches/tora3/src/CMakeLists.txt
Removed Paths:
-------------
branches/tora3/extlibs/libantlr3c-3.3/antlr3config.h
Modified: branches/tora3/CMakeLists.txt
===================================================================
--- branches/tora3/CMakeLists.txt 2012-05-08 17:24:26 UTC (rev 4306)
+++ branches/tora3/CMakeLists.txt 2012-05-08 18:03:05 UTC (rev 4307)
@@ -80,7 +80,7 @@
SET (VERSION_SUFFIX "alpha")
SET (VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}${VERSION_SUFFIX})
MESSAGE(STATUS "TOra ${VERSION} will be built to install into ${CMAKE_INSTALL_PREFIX}")
-FILE(WRITE toversion.h "#define TOVERSION \"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}\"\n")
+FILE(WRITE ${CMAKE_BINARY_DIR}/toversion.h "#define TOVERSION \"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}\"\n")
SET (EXE_NAME "tora")
if (WANT_BUNDLE)
Deleted: branches/tora3/extlibs/libantlr3c-3.3/antlr3config.h
===================================================================
--- branches/tora3/extlibs/libantlr3c-3.3/antlr3config.h 2012-05-08 17:24:26 UTC (rev 4306)
+++ branches/tora3/extlibs/libantlr3c-3.3/antlr3config.h 2012-05-08 18:03:05 UTC (rev 4307)
@@ -1,180 +0,0 @@
-/* antlr3config.h.in.cmake Generated from antlr3config.h.in and adopted for cmake */
-
-/* Define if ANTLR debugger not required */
-#define ANTLR3_NODEBUGGER
-
-/* Define if 64 bit mode required */
-/* #undef ANTLR3_USE_64BIT */
-
-/* Name of package */
-#define PACKAGE "TOra"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "ji...@te..."
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "TOra"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "TOra 3.3"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "TOra"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "3.3"
-
-/* Define to 1 if you have the ANSI C header files. */
-/* #undef STDC_HEADERS */
-
-/* Version number of package */
-#define VERSION "3.3"
-
-/* Define to 1 if you have the <arpa/nameser.h> header file. */
-/* #undef HAVE_ARPA_NAMESER_H */
-
-/* Define to 1 if you have the <ctype.h> header file. */
-#define HAVE_CTYPE_H 1
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-/* #undef HAVE_DLFCN_H */
-
-/* Define to 1 if the system has the type `intptr_t'. */
-/* #undef HAVE_INTPTR_T */
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-/* #undef HAVE_INTTYPES_H */
-
-/* Define to 1 if you have the <malloc.h> header file. */
-#define HAVE_MALLOC_H 1
-
-/* Define to 1 if you have the `memmove' function. */
-#define HAVE_MEMMOVE 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the `memset' function. */
-#define HAVE_MEMSET 1
-
-/* Define to 1 if you have the <netdb.h> header file. */
-/* #undef HAVE_NETDB_H */
-
-/* Define to 1 if you have the <netinet/in.h> header file. */
-/* #undef HAVE_NETINET_IN_H */
-
-/* Define to 1 if you have the <netinet/tcp.h> header file. */
-/* #undef HAVE_NETINET_TCP_H */
-
-/* Define to 1 if you have the <resolv.h> header file. */
-/* #undef HAVE_RESOLV_H */
-
-/* Define to 1 if you have the <socket.h> header file. */
-/* #undef HAVE_SOCKET_H */
-
-/* Define to 1 if you have the <stdarg.h> header file. */
-#define HAVE_STDARG_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-/* #undef HAVE_STRINGS_H */
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/malloc.h> header file. */
-/* #undef HAVE_SYS_MALLOC_H */
-
-/* Define to 1 if you have the <sys/socket.h> header file. */
-/* #undef HAVE_SYS_SOCKET_H */
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if the system has the type `uintptr_t'. */
-/* #undef HAVE_UINTPTR_T */
-
-/* Define to 1 if you have the <unistd.h> header file. */
-/* #undef HAVE_UNISTD_H */
-
-/* Define to 1 if you have the `accept' function. */
-/* #undef HAVE_ACCEPT */
-
-/* Define to 1 if you have the `strdup' function. */
-#define HAVE_STRDUP 1
-
-
-/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
- <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
- #define below would cause a syntax error. */
-/* #undef _UINT32_T */
-
-/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
- <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
- #define below would cause a syntax error. */
-/* #undef _UINT64_T */
-
-/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
- <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
- #define below would cause a syntax error. */
-/* #undef _UINT8_T */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
- calls it, or to nothing if 'inline' is not supported under any name. */
-#ifndef __cplusplus
-/* #undef inline */
-#endif
-
-/* Define to the type of a signed integer type of width exactly 16 bits if
- such a type exists and the standard includes do not define it. */
-/* #undef int16_t */
-
-/* Define to the type of a signed integer type of width exactly 32 bits if
- such a type exists and the standard includes do not define it. */
-/* #undef int32_t */
-
-/* Define to the type of a signed integer type of width exactly 64 bits if
- such a type exists and the standard includes do not define it. */
-/* #undef int64_t */
-
-/* Define to the type of a signed integer type of width exactly 8 bits if such
- a type exists and the standard includes do not define it. */
-/* #undef int8_t */
-
-/* Define to the type of a signed integer type wide enough to hold a pointer,
- if such a type exists, and if the system does not define it. */
-/* #undef intptr_t */
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
-
-/* Define to the type of an unsigned integer type of width exactly 16 bits if
- such a type exists and the standard includes do not define it. */
-/* #undef uint16_t */
-
-/* Define to the type of an unsigned integer type of width exactly 32 bits if
- such a type exists and the standard includes do not define it. */
-/* #undef uint32_t */
-
-/* Define to the type of an unsigned integer type of width exactly 64 bits if
- such a type exists and the standard includes do not define it. */
-/* #undef uint64_t */
-
-/* Define to the type of an unsigned integer type of width exactly 8 bits if
- such a type exists and the standard includes do not define it. */
-/* #undef uint8_t */
-
-/* Define to the type of an unsigned integer type wide enough to hold a
- pointer, if such a type exists, and if the system does not define it. */
-/* #undef uintptr_t */
Modified: branches/tora3/extlibs/libantlr3c-3.3/include/antlr3.h
===================================================================
--- branches/tora3/extlibs/libantlr3c-3.3/include/antlr3.h 2012-05-08 17:24:26 UTC (rev 4306)
+++ branches/tora3/extlibs/libantlr3c-3.3/include/antlr3.h 2012-05-08 18:03:05 UTC (rev 4307)
@@ -30,6 +30,7 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
// THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#include <antlr3config.h>
#include <antlr3defs.h>
#include <antlr3errors.h>
Modified: branches/tora3/src/CMakeLists.txt
===================================================================
--- branches/tora3/src/CMakeLists.txt 2012-05-08 17:24:26 UTC (rev 4306)
+++ branches/tora3/src/CMakeLists.txt 2012-05-08 18:03:05 UTC (rev 4307)
@@ -20,8 +20,8 @@
${CMAKE_SOURCE_DIR}/extlibs/loki/include
${CMAKE_SOURCE_DIR}/extlibs/otl
${CMAKE_SOURCE_DIR}/extlibs/trotl/src
- ${CMAKE_SOURCE_DIR}/extlibs/libantlr3c-3.3
- ${CMAKE_SOURCE_DIR}/extlibs/libantlr3c-3.3/include
+ ${CMAKE_SOURCE_DIR}/extlibs/libantlr3c-3.3/include
+ ${CMAKE_BINARY_DIR}/extlibs/libantlr3c-3.3 # generated antlr3config.h
${BOOST_INCLUDE_DIRS}
${QT_INCLUDES}
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|