Fix building on MinGW by using PRIdPTR instead of %td and add a MSVC compatible inttypes.h/stdint.h for compatibility

git-svn-id: https://svn.eduke32.com/eduke32@795 1a8010ca-5511-0410-912e-c29ae57300e0

polymer/build/Makefile

@@ -26,6 +26,7 @@ BUILD32_ON_64 ?= 0
 #  RELEASE - 1 = no debugging
 #  EFENCE  - 1 = compile with Electric Fence for malloc() debugging
 RELEASE?=1
+LEVEL3?=0
 EFENCE?=0
 
 # SDK locations - adjust to match your setup
@@ -44,9 +45,13 @@ res=o
 asm=nasm
 
 # debugging and release
-ifneq ($(RELEASE),0)
+ifneq (0,$(RELEASE))
   # debugging disabled
-  debug=-fomit-frame-pointer -O2
+  ifeq (1,$(LEVEL3))
+    debug=-fomit-frame-pointer -O3
+  else
+    debug=-fomit-frame-pointer -O2
+  endif
 else
   # debugging enabled
   debug=-ggdb -O0 -DDEBUGGINGAIDS -DNOSDLPARACHUTE

polymer/build/include/compat.h

@@ -14,6 +14,8 @@
 // (ie, they're guaranteed to be the same size as a pointer)
 #ifdef HAVE_INTTYPES
 #  include <inttypes.h>
+#elif defined(_MSC_VER)
+#  include "msvc/inttypes.h" // from http://code.google.com/p/msinttypes/
 #endif
 
 // Define this to rewrite all 'B' versions to library functions. This

polymer/build/include/msvc/inttypes.h

@@ -0,0 +1,305 @@
+// ISO C9x  compliant inttypes.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
+// 
+//  Copyright (c) 2006 Alexander Chemeris
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright notice,
+//      this list of conditions and the following disclaimer.
+// 
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+// 
+//   3. The name of the author may be used to endorse or promote products
+//      derived from this software without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_INTTYPES_H_ // [
+#define _MSC_INTTYPES_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include "stdint.h"
+
+// 7.8 Format conversion of integer types
+
+typedef struct {
+   intmax_t quot;
+   intmax_t rem;
+} imaxdiv_t;
+
+// 7.8.1 Macros for format specifiers
+
+#if !defined(__cplusplus) || defined(__STDC_FORMAT_MACROS) // [   See footnote 185 at page 198
+
+// The fprintf macros for signed integers are:
+#define PRId8       "d"
+#define PRIi8       "i"
+#define PRIdLEAST8  "d"
+#define PRIiLEAST8  "i"
+#define PRIdFAST8   "d"
+#define PRIiFAST8   "i"
+
+#define PRId16       "hd"
+#define PRIi16       "hi"
+#define PRIdLEAST16  "hd"
+#define PRIiLEAST16  "hi"
+#define PRIdFAST16   "hd"
+#define PRIiFAST16   "hi"
+
+#define PRId32       "I32d"
+#define PRIi32       "I32i"
+#define PRIdLEAST32  "I32d"
+#define PRIiLEAST32  "I32i"
+#define PRIdFAST32   "I32d"
+#define PRIiFAST32   "I32i"
+
+#define PRId64       "I64d"
+#define PRIi64       "I64i"
+#define PRIdLEAST64  "I64d"
+#define PRIiLEAST64  "I64i"
+#define PRIdFAST64   "I64d"
+#define PRIiFAST64   "I64i"
+
+#define PRIdMAX     "I64d"
+#define PRIiMAX     "I64i"
+
+#define PRIdPTR     "Id"
+#define PRIiPTR     "Ii"
+
+// The fprintf macros for unsigned integers are:
+#define PRIo8       "o"
+#define PRIu8       "u"
+#define PRIx8       "x"
+#define PRIX8       "X"
+#define PRIoLEAST8  "o"
+#define PRIuLEAST8  "u"
+#define PRIxLEAST8  "x"
+#define PRIXLEAST8  "X"
+#define PRIoFAST8   "o"
+#define PRIuFAST8   "u"
+#define PRIxFAST8   "x"
+#define PRIXFAST8   "X"
+
+#define PRIo16       "ho"
+#define PRIu16       "hu"
+#define PRIx16       "hx"
+#define PRIX16       "hX"
+#define PRIoLEAST16  "ho"
+#define PRIuLEAST16  "hu"
+#define PRIxLEAST16  "hx"
+#define PRIXLEAST16  "hX"
+#define PRIoFAST16   "ho"
+#define PRIuFAST16   "hu"
+#define PRIxFAST16   "hx"
+#define PRIXFAST16   "hX"
+
+#define PRIo32       "I32o"
+#define PRIu32       "I32u"
+#define PRIx32       "I32x"
+#define PRIX32       "I32X"
+#define PRIoLEAST32  "I32o"
+#define PRIuLEAST32  "I32u"
+#define PRIxLEAST32  "I32x"
+#define PRIXLEAST32  "I32X"
+#define PRIoFAST32   "I32o"
+#define PRIuFAST32   "I32u"
+#define PRIxFAST32   "I32x"
+#define PRIXFAST32   "I32X"
+
+#define PRIo64       "I64o"
+#define PRIu64       "I64u"
+#define PRIx64       "I64x"
+#define PRIX64       "I64X"
+#define PRIoLEAST64  "I64o"
+#define PRIuLEAST64  "I64u"
+#define PRIxLEAST64  "I64x"
+#define PRIXLEAST64  "I64X"
+#define PRIoFAST64   "I64o"
+#define PRIuFAST64   "I64u"
+#define PRIxFAST64   "I64x"
+#define PRIXFAST64   "I64X"
+
+#define PRIoMAX     "I64o"
+#define PRIuMAX     "I64u"
+#define PRIxMAX     "I64x"
+#define PRIXMAX     "I64X"
+
+#define PRIoPTR     "Io"
+#define PRIuPTR     "Iu"
+#define PRIxPTR     "Ix"
+#define PRIXPTR     "IX"
+
+// The fscanf macros for signed integers are:
+#define SCNd8       "d"
+#define SCNi8       "i"
+#define SCNdLEAST8  "d"
+#define SCNiLEAST8  "i"
+#define SCNdFAST8   "d"
+#define SCNiFAST8   "i"
+
+#define SCNd16       "hd"
+#define SCNi16       "hi"
+#define SCNdLEAST16  "hd"
+#define SCNiLEAST16  "hi"
+#define SCNdFAST16   "hd"
+#define SCNiFAST16   "hi"
+
+#define SCNd32       "ld"
+#define SCNi32       "li"
+#define SCNdLEAST32  "ld"
+#define SCNiLEAST32  "li"
+#define SCNdFAST32   "ld"
+#define SCNiFAST32   "li"
+
+#define SCNd64       "I64d"
+#define SCNi64       "I64i"
+#define SCNdLEAST64  "I64d"
+#define SCNiLEAST64  "I64i"
+#define SCNdFAST64   "I64d"
+#define SCNiFAST64   "I64i"
+
+#define SCNdMAX     "I64d"
+#define SCNiMAX     "I64i"
+
+#ifdef _WIN64 // [
+#  define SCNdPTR     "I64d"
+#  define SCNiPTR     "I64i"
+#else  // _WIN64 ][
+#  define SCNdPTR     "ld"
+#  define SCNiPTR     "li"
+#endif  // _WIN64 ]
+
+// The fscanf macros for unsigned integers are:
+#define SCNo8       "o"
+#define SCNu8       "u"
+#define SCNx8       "x"
+#define SCNX8       "X"
+#define SCNoLEAST8  "o"
+#define SCNuLEAST8  "u"
+#define SCNxLEAST8  "x"
+#define SCNXLEAST8  "X"
+#define SCNoFAST8   "o"
+#define SCNuFAST8   "u"
+#define SCNxFAST8   "x"
+#define SCNXFAST8   "X"
+
+#define SCNo16       "ho"
+#define SCNu16       "hu"
+#define SCNx16       "hx"
+#define SCNX16       "hX"
+#define SCNoLEAST16  "ho"
+#define SCNuLEAST16  "hu"
+#define SCNxLEAST16  "hx"
+#define SCNXLEAST16  "hX"
+#define SCNoFAST16   "ho"
+#define SCNuFAST16   "hu"
+#define SCNxFAST16   "hx"
+#define SCNXFAST16   "hX"
+
+#define SCNo32       "lo"
+#define SCNu32       "lu"
+#define SCNx32       "lx"
+#define SCNX32       "lX"
+#define SCNoLEAST32  "lo"
+#define SCNuLEAST32  "lu"
+#define SCNxLEAST32  "lx"
+#define SCNXLEAST32  "lX"
+#define SCNoFAST32   "lo"
+#define SCNuFAST32   "lu"
+#define SCNxFAST32   "lx"
+#define SCNXFAST32   "lX"
+
+#define SCNo64       "I64o"
+#define SCNu64       "I64u"
+#define SCNx64       "I64x"
+#define SCNX64       "I64X"
+#define SCNoLEAST64  "I64o"
+#define SCNuLEAST64  "I64u"
+#define SCNxLEAST64  "I64x"
+#define SCNXLEAST64  "I64X"
+#define SCNoFAST64   "I64o"
+#define SCNuFAST64   "I64u"
+#define SCNxFAST64   "I64x"
+#define SCNXFAST64   "I64X"
+
+#define SCNoMAX     "I64o"
+#define SCNuMAX     "I64u"
+#define SCNxMAX     "I64x"
+#define SCNXMAX     "I64X"
+
+#ifdef _WIN64 // [
+#  define SCNoPTR     "I64o"
+#  define SCNuPTR     "I64u"
+#  define SCNxPTR     "I64x"
+#  define SCNXPTR     "I64X"
+#else  // _WIN64 ][
+#  define SCNoPTR     "lo"
+#  define SCNuPTR     "lu"
+#  define SCNxPTR     "lx"
+#  define SCNXPTR     "lX"
+#endif  // _WIN64 ]
+
+#endif // __STDC_FORMAT_MACROS ]
+
+// 7.8.2 Functions for greatest-width integer types
+
+// 7.8.2.1 The imaxabs function
+#define imaxabs _abs64
+
+// 7.8.2.2 The imaxdiv function
+
+// This is modified version of div() function from Microsoft's div.c found
+// in %MSVC.NET%\crt\src\div.c
+#ifdef STATIC_IMAXDIV // [
+static
+#else // STATIC_IMAXDIV ][
+_inline
+#endif // STATIC_IMAXDIV ]
+imaxdiv_t __cdecl imaxdiv(intmax_t numer, intmax_t denom)
+{
+   imaxdiv_t result;
+
+   result.quot = numer / denom;
+   result.rem = numer % denom;
+
+   if (numer < 0 && result.rem > 0) {
+      // did division wrong; must fix up
+      ++result.quot;
+      result.rem -= denom;
+   }
+
+   return result;
+}
+
+// 7.8.2.3 The strtoimax and strtoumax functions
+#define strtoimax _strtoi64
+#define strtoumax _strtoui64
+
+// 7.8.2.4 The wcstoimax and wcstoumax functions
+#define wcstoimax _wcstoi64
+#define wcstoumax _wcstoui64
+
+
+#endif // _MSC_INTTYPES_H_ ]

polymer/build/include/msvc/stdint.h

@@ -0,0 +1,222 @@
+// ISO C9x  compliant stdint.h for Microsoft Visual Studio
+// Based on ISO/IEC 9899:TC2 Committee draft (May 6, 2005) WG14/N1124 
+// 
+//  Copyright (c) 2006 Alexander Chemeris
+// 
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are met:
+// 
+//   1. Redistributions of source code must retain the above copyright notice,
+//      this list of conditions and the following disclaimer.
+// 
+//   2. Redistributions in binary form must reproduce the above copyright
+//      notice, this list of conditions and the following disclaimer in the
+//      documentation and/or other materials provided with the distribution.
+// 
+//   3. The name of the author may be used to endorse or promote products
+//      derived from this software without specific prior written permission.
+// 
+// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+// 
+///////////////////////////////////////////////////////////////////////////////
+
+#ifndef _MSC_VER // [
+#error "Use this header only with Microsoft Visual C++ compilers!"
+#endif // _MSC_VER ]
+
+#ifndef _MSC_STDINT_H_ // [
+#define _MSC_STDINT_H_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif
+
+#include <limits.h>
+
+// For Visual Studio 6 in C++ mode wrap <wchar.h> include with 'extern "C++" {}'
+// or compiler give many errors like this:
+//   error C2733: second C linkage of overloaded function 'wmemchr' not allowed
+#if (_MSC_VER < 1300) && defined(__cplusplus)
+   extern "C++" {
+#endif 
+#     include <wchar.h>
+#if (_MSC_VER < 1300) && defined(__cplusplus)
+   }
+#endif
+
+// 7.18.1 Integer types
+
+// 7.18.1.1 Exact-width integer types
+typedef __int8            int8_t;
+typedef __int16           int16_t;
+typedef __int32           int32_t;
+typedef __int64           int64_t;
+typedef unsigned __int8   uint8_t;
+typedef unsigned __int16  uint16_t;
+typedef unsigned __int32  uint32_t;
+typedef unsigned __int64  uint64_t;
+
+// 7.18.1.2 Minimum-width integer types
+typedef int8_t    int_least8_t;
+typedef int16_t   int_least16_t;
+typedef int32_t   int_least32_t;
+typedef int64_t   int_least64_t;
+typedef uint8_t   uint_least8_t;
+typedef uint16_t  uint_least16_t;
+typedef uint32_t  uint_least32_t;
+typedef uint64_t  uint_least64_t;
+
+// 7.18.1.3 Fastest minimum-width integer types
+typedef int8_t    int_fast8_t;
+typedef int16_t   int_fast16_t;
+typedef int32_t   int_fast32_t;
+typedef int64_t   int_fast64_t;
+typedef uint8_t   uint_fast8_t;
+typedef uint16_t  uint_fast16_t;
+typedef uint32_t  uint_fast32_t;
+typedef uint64_t  uint_fast64_t;
+
+// 7.18.1.4 Integer types capable of holding object pointers
+#ifdef _WIN64 // [
+   typedef __int64           intptr_t;
+   typedef unsigned __int64  uintptr_t;
+#else // _WIN64 ][
+   typedef int               intptr_t;
+   typedef unsigned int      uintptr_t;
+#endif // _WIN64 ]
+
+// 7.18.1.5 Greatest-width integer types
+typedef int64_t   intmax_t;
+typedef uint64_t  uintmax_t;
+
+
+// 7.18.2 Limits of specified-width integer types
+
+#if !defined(__cplusplus) || defined(__STDC_LIMIT_MACROS) // [   See footnote 220 at page 257 and footnote 221 at page 259
+
+// 7.18.2.1 Limits of exact-width integer types
+#define INT8_MIN     ((int8_t)_I8_MIN)
+#define INT8_MAX     _I8_MAX
+#define INT16_MIN    ((int16_t)_I16_MIN)
+#define INT16_MAX    _I16_MAX
+#define INT32_MIN    ((int32_t)_I32_MIN)
+#define INT32_MAX    _I32_MAX
+#define INT64_MIN    ((int64_t)_I64_MIN)
+#define INT64_MAX    _I64_MAX
+#define UINT8_MAX    _UI8_MAX
+#define UINT16_MAX   _UI16_MAX
+#define UINT32_MAX   _UI32_MAX
+#define UINT64_MAX   _UI64_MAX
+
+// 7.18.2.2 Limits of minimum-width integer types
+#define INT_LEAST8_MIN    INT8_MIN
+#define INT_LEAST8_MAX    INT8_MAX
+#define INT_LEAST16_MIN   INT16_MIN
+#define INT_LEAST16_MAX   INT16_MAX
+#define INT_LEAST32_MIN   INT32_MIN
+#define INT_LEAST32_MAX   INT32_MAX
+#define INT_LEAST64_MIN   INT64_MIN
+#define INT_LEAST64_MAX   INT64_MAX
+#define UINT_LEAST8_MAX   UINT8_MAX
+#define UINT_LEAST16_MAX  UINT16_MAX
+#define UINT_LEAST32_MAX  UINT32_MAX
+#define UINT_LEAST64_MAX  UINT64_MAX
+
+// 7.18.2.3 Limits of fastest minimum-width integer types
+#define INT_FAST8_MIN    INT8_MIN
+#define INT_FAST8_MAX    INT8_MAX
+#define INT_FAST16_MIN   INT16_MIN
+#define INT_FAST16_MAX   INT16_MAX
+#define INT_FAST32_MIN   INT32_MIN
+#define INT_FAST32_MAX   INT32_MAX
+#define INT_FAST64_MIN   INT64_MIN
+#define INT_FAST64_MAX   INT64_MAX
+#define UINT_FAST8_MAX   UINT8_MAX
+#define UINT_FAST16_MAX  UINT16_MAX
+#define UINT_FAST32_MAX  UINT32_MAX
+#define UINT_FAST64_MAX  UINT64_MAX
+
+// 7.18.2.4 Limits of integer types capable of holding object pointers
+#ifdef _WIN64 // [
+#  define INTPTR_MIN   INT64_MIN
+#  define INTPTR_MAX   INT64_MAX
+#  define UINTPTR_MAX  UINT64_MAX
+#else // _WIN64 ][
+#  define INTPTR_MIN   INT32_MIN
+#  define INTPTR_MAX   INT32_MAX
+#  define UINTPTR_MAX  UINT32_MAX
+#endif // _WIN64 ]
+
+// 7.18.2.5 Limits of greatest-width integer types
+#define INTMAX_MIN   INT64_MIN
+#define INTMAX_MAX   INT64_MAX
+#define UINTMAX_MAX  UINT64_MAX
+
+// 7.18.3 Limits of other integer types
+
+#ifdef _WIN64 // [
+#  define PTRDIFF_MIN  _I64_MIN
+#  define PTRDIFF_MAX  _I64_MAX
+#else  // _WIN64 ][
+#  define PTRDIFF_MIN  _I32_MIN
+#  define PTRDIFF_MAX  _I32_MAX
+#endif  // _WIN64 ]
+
+#define SIG_ATOMIC_MIN  INT_MIN
+#define SIG_ATOMIC_MAX  INT_MAX
+
+#ifndef SIZE_MAX // [
+#  ifdef _WIN64 // [
+#     define SIZE_MAX  _UI64_MAX
+#  else // _WIN64 ][
+#     define SIZE_MAX  _UI32_MAX
+#  endif // _WIN64 ]
+#endif // SIZE_MAX ]
+
+// WCHAR_MIN and WCHAR_MAX are also defined in <wchar.h>
+#ifndef WCHAR_MIN // [
+#  define WCHAR_MIN  0
+#endif  // WCHAR_MIN ]
+#ifndef WCHAR_MAX // [
+#  define WCHAR_MAX  _UI16_MAX
+#endif  // WCHAR_MAX ]
+
+#define WINT_MIN  0
+#define WINT_MAX  _UI16_MAX
+
+#endif // __STDC_LIMIT_MACROS ]
+
+
+// 7.18.4 Limits of other integer types
+
+#if !defined(__cplusplus) || defined(__STDC_CONSTANT_MACROS) // [   See footnote 224 at page 260
+
+// 7.18.4.1 Macros for minimum-width integer constants
+
+#define INT8_C(val)  val##i8
+#define INT16_C(val) val##i16
+#define INT32_C(val) val##i32
+#define INT64_C(val) val##i64
+
+#define UINT8_C(val)  val##ui8
+#define UINT16_C(val) val##ui16
+#define UINT32_C(val) val##ui32
+#define UINT64_C(val) val##ui64
+
+// 7.18.4.2 Macros for greatest-width integer constants
+#define INTMAX_C   INT64_C
+#define UINTMAX_C  UINT64_C
+
+#endif // __STDC_CONSTANT_MACROS ]
+
+
+#endif // _MSC_STDINT_H_ ]

polymer/build/src/cache1d.c

@@ -119,7 +119,7 @@ void allocache(intptr_t *newhandle, int newbytes, char *newlockptr)
     if ((unsigned)newbytes > (unsigned)cachesize)
     {
         Bprintf("Cachesize: %d\n",cachesize);
-        Bprintf("*Newhandle: 0x%tx, Newbytes: %d, *Newlock: %d\n",(intptr_t)newhandle,newbytes,*newlockptr);
+        Bprintf("*Newhandle: 0x%" PRIxPTR ", Newbytes: %d, *Newlock: %d\n",(intptr_t)newhandle,newbytes,*newlockptr);
         reportandexit("BUFFER TOO BIG TO FIT IN CACHE!");
     }
 
@@ -239,7 +239,7 @@ static void reportandexit(char *errormessage)
     for (i=0;i<cacnum;i++)
     {
         Bprintf("%d- ",i);
-        if (cac[i].hand) Bprintf("ptr: 0x%tx, ",*cac[i].hand);
+        if (cac[i].hand) Bprintf("ptr: 0x%" PRIxPTR ", ",*cac[i].hand);
         else Bprintf("ptr: NULL, ");
         Bprintf("leng: %d, ",cac[i].leng);
         if (cac[i].lock) Bprintf("lock: %d\n",*cac[i].lock);

polymer/build/src/compat.c

@@ -395,7 +395,7 @@ char *Bgetsupportdir(int global)
 int Bcorrectfilename(char *filename, int removefn)
 {
     char *fn;
-    char *tokarr[64], *first, *next, *token;
+    char *tokarr[64], *first, *next = NULL, *token;
     int i, ntok = 0, leadslash = 0, trailslash = 0;
 
     fn = strdup(filename);

polymer/build/src/glbuild.c

@@ -235,7 +235,7 @@ int loadgldriver(const char *driver)
 #elif defined __APPLE__
         driver = "/System/Library/Frameworks/OpenGL.framework/OpenGL";
 #else
-        driver = "libGL.so";
+        driver = "libGL.so.1";
 #endif
     }
 
@@ -624,7 +624,7 @@ int loadglulibrary(const char *driver)
 #elif defined __APPLE__
         driver = "/System/Library/Frameworks/OpenGL.framework/OpenGL"; // FIXME: like I know anything about Apple.  Hah.
 #else
-        driver = "libGLU.so";
+        driver = "libGLU.so.1";
 #endif
     }
 

polymer/eduke32/Makefile

@@ -17,6 +17,7 @@ BUILD32_ON_64 = 0
 RELEASE?=1
 NOSOUND?=0
 USE_OPENAL?=1
+LEVEL3?=0
 
 # build locations
 
@@ -30,7 +31,11 @@ o=o
 
 ifneq (0,$(RELEASE))
   # debugging disabled
-  debug=-fomit-frame-pointer -O2
+  ifeq (1,$(LEVEL3))
+    debug=-fomit-frame-pointer -O3
+  else
+    debug=-fomit-frame-pointer -O2
+  endif
 else
   # debugging enabled
   debug=-ggdb -O0 -DDEBUGGINGAIDS
@@ -223,7 +228,7 @@ enginelib editorlib:
 	$(MAKE) -C $(EROOT)/ "OBJ=$(CURDIR)/$(EOBJ)" \
 		SUPERBUILD=$(SUPERBUILD) POLYMOST=$(POLYMOST) \
 		USE_OPENGL=$(USE_OPENGL) BUILD32_ON_64=$(BUILD32_ON_64) \
-		NOASM=$(NOASM) RELEASE=$(RELEASE) $@
+		NOASM=$(NOASM) RELEASE=$(RELEASE) LEVEL3=$(LEVEL3) $@
 	
 $(EOBJ)/$(ENGINELIB): enginelib
 $(EOBJ)/$(EDITORLIB): editorlib

polymer/eduke32/eduke32.vcproj

@@ -706,13 +706,13 @@
 					>
 				</File>
 				<File
-                                        RelativePath=".\source\jaudiolib\openal.h"
-                                        >
-                                </File>
-                                <File
 					RelativePath=".\source\jaudiolib\music.h"
 					>
 				</File>
+				<File
+					RelativePath=".\source\jaudiolib\openal.h"
+					>
+				</File>
 				<File
 					RelativePath=".\source\jaudiolib\pitch.h"
 					>
@@ -778,13 +778,13 @@
 					>
 				</File>
 				<File
-                                        RelativePath=".\source\jaudiolib\openal.c"
-                                        >
-                                </File>
-                                <File
 					RelativePath=".\source\jaudiolib\music.c"
 					>
 				</File>
+				<File
+					RelativePath=".\source\jaudiolib\openal.c"
+					>
+				</File>
 				<File
 					RelativePath=".\source\jaudiolib\pitch.c"
 					>
@@ -891,6 +891,14 @@
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="Misc"
+			>
+			<File
+				RelativePath=".\m32help.hlp"
+				>
+			</File>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>

polymer/eduke32/m32help.hlp

@@ -1,9 +1,9 @@
- *** Mapster32 Help: Table of contents ***
+ *** Mapster32 Help: Table of contents ***
 1. 2D mode mouse reference
-2. 2D mode keyboard reference
+2. 2D mode keyboard reference
 3. 3D mode mouse reference
 4. 3D mode keyboard reference
-5. 3D mode tile selector refrence
+5. 3D mode tile selector refrence
 6. Sector effector reference
 7. Sector tag reference
 ^P
@@ -17,8 +17,9 @@ Every time mouse is pointing at one of these:
 5. Wall (wall without sector - map is corrupt)
 6. Sprite (sprite without sector - map is corrupt)
 
-Some commands work differently depending on the current object(the object the mouse points at).
+Some commands work differently depending on the currently selected object.
-To solve ambiguous between sector and wall/sprite, one usually must press ALT to work with wall/sprite instead of sectors.
+To solve ambiguous between sector and wall/sprite, one usually must press
+ALT to work with wall/sprite instead of sectors.
 
 RSHIFT select vertex/sprites
 RALT select sectors
@@ -96,12 +97,16 @@ TAB show sector data
 TAB+CTRL show wall/sprite data
 TAB+ALT show wall/sprite data (Windows may trigger on this shortcut)
 
-LCTRL+RSHIFT select all walls of the current sector(point at a wall and holding CTRL, press SHIFT).
+LCTRL+RSHIFT select all walls of the current sector(point at a wall and holding
+CTRL, press SHIFT).
+
 A zoom in
 Z zoom out
 L toggle grid lock
 J join sectors
-S insert sprite (As of the newest snapshot (20080516), pressing a key from 1 to 0 on the upper row before pressing S will make the inserted sprite's picnum be 1 to 10, respectively)
+S insert sprite
+	pressing a key from 1 to 0 on the upper row before pressing S will make the
+	inserted sprite's picnum be 1 to 10, respectively
 S+ALT make inner sector
 C duplicate sectors/sprites
 C start circle attached to a wall
@@ -124,9 +129,8 @@ ESC menu
 S+CTRL save map
 L+CTRL load map
 ^P
-The purpose of mouse in 3D mode is pointing at some objects in a map and looking around(F3 - mouselook).
+Mouse pointer always points(see info about it at the bottom of the screen) at
-
+one of these objects:
-Mouse pointer always points(see info about it at the bottom of the screen) at one of these object:
 1. wall
 2. ceiling of sector
 3. floor of sector
@@ -134,22 +138,28 @@ Mouse pointer always points(see info about it at the bottom of the screen) at on
 5. masked wall (non-transparent or semi-transparent wall between sectors)
 
 It's important to understand this concept:
-Some commands work differently depending on the current object(the object the mouse points at).
+Some commands work differently depending on the current object(the object the
-Some commands manipulate only with current object, and some commands manipulate with sprites/sectors selected(hereinafter referred to as "selected") in 2D mode, and some commands work globally.
+mouse points at).
+Some commands manipulate only with current object, and some commands manipulate
+with sprites/sectors selected(hereinafter referred to as "selected") in 2D mode
+and some commands work globally.
 
 Mouse buttons:
-LEFT lock the current object. The current object won't be changing as long as the button pressed.
+LEFT lock the current object. The current object won't be changing as long as
+the button is pressed.
 LEFT+MIDDLE toggle mouse look
 WHEEL change shade/visibility
 LEFT+WHEEL change tile
 RIGHT+WHEEL move object up/down
 
-Additionally, there is now UnrealEd-style mouse navigation in 3D mode (toggle it with F5), with the following bindings:
+Additionally, there is now UnrealEd-style mouse navigation in 3D mode (toggle
+it with F5), with the following bindings:
 RIGHT mouselook
 LEFT x: turning, y: move forward/back
 LEFT+RIGHT x: strafe left/right, y: move up/down
 MIDDLE y: move in viewing direction
-The console variable 'pk_uedaccel' changes the speed of navigation exponentially (valid values are 0-5).
+The console variable 'pk_uedaccel' changes the speed of navigation exponentially
+(valid values are 0-5).
 
 LEFT+ALT move object up/down
 LEFT+SHIFT pan ceiling/floor/wall
@@ -233,7 +243,10 @@ Note: CTRL, HOME, END are modifiers so they work with mouse too.
 ' X toggle sprite shade preview
 ' W toggle sprite display
 ' Y toggle purple background
-' C copy shade from the clipboard to all objects in the map which are the same tile as the tile of the object that in the clipboard. It works separately for sectors/walls/sprites depending on the current object. (I hope somebody who understands this, will clarify this)
+' C copy shade from the clipboard to all objects in the map which are the same
+tile as the tile of the object that in the clipboard. It works separately for
+sectors/walls/sprites depending on the current object. (I hope somebody who
+understands this, will clarify this)
 ' T set lotag
 ' H set hitag
 ' S set shade
@@ -247,18 +260,21 @@ T cycles translucence for sprites/masked walls
 
 LENTER+CTRL+SHIFT autoshade wall
 ' LENTER paste picnum only
-LENTER+SHIFT paste some visaul(shading+pal) properties of the clipboard on sector/wall/sprite
+LENTER+SHIFT paste some visaul(shading+pal) properties of the clipboard on
-LENTER+CTRL paste some visaul(picnum+shading+pal) properties of the clipboard on sector/wall/sprite
+sector/wall/sprite
-LENTER paste all(picnum+shading+pal+flags+tags+extra) properties of the clipboard on sector/wall/sprite
+LENTER+CTRL paste some visaul(picnum+shading+pal) properties of the clipboard
+on sector/wall/sprite
+LENTER paste all(picnum+shading+pal+flags+tags+extra) properties of the
+clipboard on sector/wall/sprite
 
-' A toggle autosave. The interval is configurable in the mapster32(by default: every 3 minutes)
+' A toggle autosave. The interval is configurable in the cfg
+	(by default: every 3 minutes)
 
 ' N toggle noclip for the camera
 N+CTRL toggle noclip sprites
 
 S+CTRL save map
 L+CTRL load map
-' 5 something strange, I don't know yet. Some comments from the source code: "Motorcycle ha ha ha","What the f*** is this supposed to do?".
 
 ESC quit
 F11 brightness
@@ -324,59 +340,59 @@ CTRL+WHEEL zoom
 WHEEL scroll
 RIGHT smooth scrolling
 ^P
- 0  : ROTATED SECTOR
+ 0  : ROTATED SECTOR
- 1  : PIVOT SPRITE FOR SE 0
+ 1  : PIVOT SPRITE FOR SE 0
- 2  : EARTHQUAKE
+ 2  : EARTHQUAKE
- 3  : RANDOM LIGHTS AFTER SHOT OUT
+ 3  : RANDOM LIGHTS AFTER SHOT OUT
- 4  : RANDOM LIGHTS
+ 4  : RANDOM LIGHTS
- 6  : SUBWAY
+ 6  : SUBWAY
- 7  : TRANSPORT (UNDERWATER ST 1 or 2)
+ 7  : TRANSPORT (UNDERWATER ST 1 or 2)
- 8  : UP OPEN DOOR LIGHTS
+ 8  : UP OPEN DOOR LIGHTS
- 9  : DOWN OPEN DOOR LIGHTS
+ 9  : DOWN OPEN DOOR LIGHTS
- 10 : DOOR AUTO CLOSE (H=DELAY)
+ 10 : DOOR AUTO CLOSE (H=DELAY)
- 11 : ROTATE SECTOR DOOR
+ 11 : ROTATE SECTOR DOOR
- 12 : LIGHT SWITCH
+ 12 : LIGHT SWITCH
- 13 : C-9 EXPLOSIVE
+ 13 : C-9 EXPLOSIVE
- 14 : SUBWAY CAR
+ 14 : SUBWAY CAR
- 15 : SLIDE DOOR (ST 25)
+ 15 : SLIDE DOOR (ST 25)
- 16 : ROTATE REACTOR SECTOR
+ 16 : ROTATE REACTOR SECTOR
- 17 : ELEVATOR TRANSPORT (ST 15)
+ 17 : ELEVATOR TRANSPORT (ST 15)
- 18 : INCREMENTAL SECTOR RISE/FALL
+ 18 : INCREMENTAL SECTOR RISE/FALL
- 19 : SHOT TOUCHPLATE CIELING DOWN
+ 19 : SHOT TOUCHPLATE CIELING DOWN
- 20 : BRIDGE (ST 27)
+ 20 : BRIDGE (ST 27)
- 21 : DROP FLOOR (ST 28)
+ 21 : DROP FLOOR (ST 28)
- 22 : PRONG (ST 29)
+ 22 : PRONG (ST 29)
- 23 : TRANSPORT DESTINATION (H=SE 7)
+ 23 : TRANSPORT DESTINATION (H=SE 7)
- 24 : CONVAIRBELT
+ 24 : CONVAIRBELT
- 25 : ENGINE
+ 25 : ENGINE
- 28 : LIGHTNING (H= TILE#4890)
+ 28 : LIGHTNING (H= TILE#4890)
- 27 : CAMERA FOR PLAYBACK
+ 27 : CAMERA FOR PLAYBACK
- 29 : FLOAT
+ 29 : FLOAT
- 30 : 2 WAY TRAIN (ST=31)
+ 30 : 2 WAY TRAIN (ST=31)
- 31 : FLOOR RISE
+ 31 : FLOOR RISE
- 32 : CEILING FALL
+ 32 : CEILING FALL
- 33 : SPAWN JIB W/QUAKE
+ 33 : SPAWN JIB W/QUAKE
  36 : SKRINK RAY SHOOTER
 ^P
- 1  : WATER (SE 7)
+ 1  : WATER (SE 7)
- 2  : UNDERWATER (SE 7)
+ 2  : UNDERWATER (SE 7)
- 9  : STAR TREK DOORS
+ 9  : STAR TREK DOORS
- 15 : ELEVATOR TRANSPORT (SE 17)
+ 15 : ELEVATOR TRANSPORT (SE 17)
- 16 : ELEVATOR PLATFORM DOWN
+ 16 : ELEVATOR PLATFORM DOWN
- 17 : ELEVATOR PLATFORM UP
+ 17 : ELEVATOR PLATFORM UP
- 18 : ELEVATOR DOWN
+ 18 : ELEVATOR DOWN
- 19 : ELEVATOR UP
+ 19 : ELEVATOR UP
- 20 : CEILING DOOR
+ 20 : CEILING DOOR
- 21 : FLOOR DOOR
+ 21 : FLOOR DOOR
- 22 : SPLIT DOOR
+ 22 : SPLIT DOOR
- 23 : SWING DOOR
+ 23 : SWING DOOR
- 25 : SLIDE DOOR (SE 15)
+ 25 : SLIDE DOOR (SE 15)
- 26 : SPLIT STAR TREK DOOR
+ 26 : SPLIT STAR TREK DOOR
- 27 : BRIDGE (SE 20)
+ 27 : BRIDGE (SE 20)
- 28 : DROP FLOOR (SE 21)
+ 28 : DROP FLOOR (SE 21)
- 29 : TEETH DOOR (SE 22)
+ 29 : TEETH DOOR (SE 22)
- 30 : ROTATE RISE BRIDGE
+ 30 : ROTATE RISE BRIDGE
- 31 : 2 WAY TRAIN (SE=30)
+ 31 : 2 WAY TRAIN (SE=30)
- 10000+ : 1 TIME SOUND
+ 10000+ : 1 TIME SOUND
- 32767 : SECRET ROOM
+ 32767 : SECRET ROOM
- 65535 : END OF LEVEL
+ 65535 : END OF LEVEL

polymer/eduke32/source/actors.c

@@ -5579,7 +5579,7 @@ static void moveeffectors(void)   //STATNUM 3
 
             if (s->owner == -1)
             {
-                Bsprintf(tempbuf,"Could not find any locators for SE# 6 and 14 with a hitag of %td.\n",t[3]);
+                Bsprintf(tempbuf,"Could not find any locators for SE# 6 and 14 with a hitag of %" PRIdPTR ".\n",t[3]);
                 gameexit(tempbuf);
             }
 

polymer/eduke32/source/astub.c

@@ -7938,7 +7938,7 @@ static void Keys2d3d(void)
     if (keystatus[KEYSC_F12])   //F12
     {
         screencapture("captxxxx.tga",keystatus[KEYSC_LSHIFT]|keystatus[KEYSC_RSHIFT]);
-        message("Saved screenshot %d",capturecount-1);
+        message("Saved screenshot %04d",capturecount-1);
         keystatus[KEYSC_F12] = 0;
     }
 

polymer/eduke32/source/game.c

@@ -4271,23 +4271,23 @@ static void dumpdebugdata(void)
         for (j=0;j<numplayers;j++)
         {
             fprintf(fp,"Player %d\n\n",j);
-            fprintf(fp,"WEAPON%d_CLIP %td\n",i,aplWeaponClip[i][j]);
+            fprintf(fp,"WEAPON%d_CLIP %" PRIdPTR "\n",i,aplWeaponClip[i][j]);
-            fprintf(fp,"WEAPON%d_RELOAD %td\n",i,aplWeaponReload[i][j]);
+            fprintf(fp,"WEAPON%d_RELOAD %" PRIdPTR "\n",i,aplWeaponReload[i][j]);
-            fprintf(fp,"WEAPON%d_FIREDELAY %td\n",i,aplWeaponFireDelay[i][j]);
+            fprintf(fp,"WEAPON%d_FIREDELAY %" PRIdPTR "\n",i,aplWeaponFireDelay[i][j]);
-            fprintf(fp,"WEAPON%d_TOTALTIME %td\n",i,aplWeaponTotalTime[i][j]);
+            fprintf(fp,"WEAPON%d_TOTALTIME %" PRIdPTR "\n",i,aplWeaponTotalTime[i][j]);
-            fprintf(fp,"WEAPON%d_HOLDDELAY %td\n",i,aplWeaponHoldDelay[i][j]);
+            fprintf(fp,"WEAPON%d_HOLDDELAY %" PRIdPTR "\n",i,aplWeaponHoldDelay[i][j]);
-            fprintf(fp,"WEAPON%d_FLAGS %td\n",i,aplWeaponFlags[i][j]);
+            fprintf(fp,"WEAPON%d_FLAGS %" PRIdPTR "\n",i,aplWeaponFlags[i][j]);
-            fprintf(fp,"WEAPON%d_SHOOTS %td\n",i,aplWeaponShoots[i][j]);
+            fprintf(fp,"WEAPON%d_SHOOTS %" PRIdPTR "\n",i,aplWeaponShoots[i][j]);
-            fprintf(fp,"WEAPON%d_SPAWNTIME %td\n",i,aplWeaponSpawnTime[i][j]);
+            fprintf(fp,"WEAPON%d_SPAWNTIME %" PRIdPTR "\n",i,aplWeaponSpawnTime[i][j]);
-            fprintf(fp,"WEAPON%d_SPAWN %td\n",i,aplWeaponSpawn[i][j]);
+            fprintf(fp,"WEAPON%d_SPAWN %" PRIdPTR "\n",i,aplWeaponSpawn[i][j]);
-            fprintf(fp,"WEAPON%d_SHOTSPERBURST %td\n",i,aplWeaponShotsPerBurst[i][j]);
+            fprintf(fp,"WEAPON%d_SHOTSPERBURST %" PRIdPTR "\n",i,aplWeaponShotsPerBurst[i][j]);
-            fprintf(fp,"WEAPON%d_WORKSLIKE %td\n",i,aplWeaponWorksLike[i][j]);
+            fprintf(fp,"WEAPON%d_WORKSLIKE %" PRIdPTR "\n",i,aplWeaponWorksLike[i][j]);
-            fprintf(fp,"WEAPON%d_INITIALSOUND %td\n",i,aplWeaponInitialSound[i][j]);
+            fprintf(fp,"WEAPON%d_INITIALSOUND %" PRIdPTR "\n",i,aplWeaponInitialSound[i][j]);
-            fprintf(fp,"WEAPON%d_FIRESOUND %td\n",i,aplWeaponFireSound[i][j]);
+            fprintf(fp,"WEAPON%d_FIRESOUND %" PRIdPTR "\n",i,aplWeaponFireSound[i][j]);
-            fprintf(fp,"WEAPON%d_SOUND2TIME %td\n",i,aplWeaponSound2Time[i][j]);
+            fprintf(fp,"WEAPON%d_SOUND2TIME %" PRIdPTR "\n",i,aplWeaponSound2Time[i][j]);
-            fprintf(fp,"WEAPON%d_SOUND2SOUND %td\n",i,aplWeaponSound2Sound[i][j]);
+            fprintf(fp,"WEAPON%d_SOUND2SOUND %" PRIdPTR "\n",i,aplWeaponSound2Sound[i][j]);
-            fprintf(fp,"WEAPON%d_RELOADSOUND1 %td\n",i,aplWeaponReloadSound1[i][j]);
+            fprintf(fp,"WEAPON%d_RELOADSOUND1 %" PRIdPTR "\n",i,aplWeaponReloadSound1[i][j]);
-            fprintf(fp,"WEAPON%d_RELOADSOUND2 %td\n",i,aplWeaponReloadSound2[i][j]);
+            fprintf(fp,"WEAPON%d_RELOADSOUND2 %" PRIdPTR "\n",i,aplWeaponReloadSound2[i][j]);
         }
         fprintf(fp,"\n");
     }
@@ -4304,7 +4304,7 @@ static void dumpdebugdata(void)
                     if (aGameVars[i].plValues[j] != aGameVars[i].lDefault)
                     {
                         fprintf(fp,"gamevar %s ",aGameVars[i].szLabel);
-                        fprintf(fp,"%td",aGameVars[i].plValues[j]);
+                        fprintf(fp,"%" PRIdPTR "",aGameVars[i].plValues[j]);
                         fprintf(fp," GAMEVAR_FLAG_PERACTOR");
                         if (aGameVars[i].dwFlags != GAMEVAR_FLAG_PERACTOR)
                         {

polymer/eduke32/source/gamedef.c

@@ -1409,7 +1409,7 @@ static void transvartype(int type)
             initprintf("%s:%d: debug: accepted constant %d in place of gamevar.\n",compilefile,line_number,atol(textptr));
         *scriptptr++=MAXGAMEVARS;
         if (tolower(textptr[1])=='x')
-            sscanf(textptr+2,"%tx",scriptptr);
+            sscanf(textptr+2,"%" PRIxPTR "",scriptptr);
         else
             *scriptptr=atol(textptr);
         scriptptr++;
@@ -1621,7 +1621,7 @@ static int transnum(int type)
     }
     if (!(error || warning) && g_ScriptDebug > 1)
         initprintf("%s:%d: debug: accepted constant %d.\n",compilefile,line_number,atol(textptr));
-    if (tolower(textptr[1])=='x')sscanf(textptr+2,"%tx",scriptptr);
+    if (tolower(textptr[1])=='x')sscanf(textptr+2,"%" PRIxPTR "",scriptptr);
     else
         *scriptptr = atol(textptr);
     scriptptr++;
@@ -4485,7 +4485,7 @@ repeatcase:
         if (!fta_quotes[k])
         {
             fta_quotes[k] = NULL;
-            Bsprintf(tempbuf,"Failed allocating %td byte quote text buffer.",sizeof(char) * MAXQUOTELEN);
+            Bsprintf(tempbuf,"Failed allocating %" PRIdPTR " byte quote text buffer.",sizeof(char) * MAXQUOTELEN);
             gameexit(tempbuf);
         }
 
@@ -4504,7 +4504,7 @@ repeatcase:
             if (!redefined_quotes[redefined_quote_count])
             {
                 redefined_quotes[redefined_quote_count] = NULL;
-                Bsprintf(tempbuf,"Failed allocating %td byte quote text buffer.",sizeof(char) * MAXQUOTELEN);
+                Bsprintf(tempbuf,"Failed allocating %" PRIdPTR " byte quote text buffer.",sizeof(char) * MAXQUOTELEN);
                 gameexit(tempbuf);
             }
         }
@@ -4598,7 +4598,7 @@ repeatcase:
             g_sounds[k].filename = Bcalloc(BMAX_PATH,sizeof(char));
         if (!g_sounds[k].filename)
         {
-            Bsprintf(tempbuf,"Failed allocating %td byte buffer.",sizeof(char) * BMAX_PATH);
+            Bsprintf(tempbuf,"Failed allocating %" PRIdPTR " byte buffer.",sizeof(char) * BMAX_PATH);
             gameexit(tempbuf);
         }
 

polymer/eduke32/source/gamevars.c

@@ -303,7 +303,7 @@ void DumpGameVars(FILE *fp)
             else if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_CHARPTR))
                 fprintf(fp,"%d",*((char*)aGameVars[i].lValue));
             else
-                fprintf(fp,"%td",aGameVars[i].lValue);
+                fprintf(fp,"%" PRIdPTR "",aGameVars[i].lValue);
             if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_PERPLAYER))
                 fprintf(fp," GAMEVAR_FLAG_PERPLAYER");
             else if (aGameVars[i].dwFlags & (GAMEVAR_FLAG_PERACTOR))