- Fix GCC warning:

warning: converting to non-pointer type 'int' from NULL
- Force static linking to libstdc++ and libgcc, because MinGW GCC 4.5.0 wants to do it
  dynamically.

SVN r2362 (trunk)
This commit is contained in:
Randy Heit 2010-06-12 03:37:16 +00:00
parent c9406fbd45
commit 28e30fbb7b
2 changed files with 114 additions and 114 deletions

View file

@ -13,7 +13,7 @@ CFLAGS += -O3 -fomit-frame-pointer -DNDEBUG
CFLAGS += -mtune=i686
#CFLAGS += -march=k8
LDFLAGS =
LDFLAGS = -static-libstdc++ -static-libgcc
RM = rm -f FILE
ZLIBDIR = zlib/

View file

@ -239,8 +239,8 @@ DWORD FNodeBuilder::AddMiniseg (int v1, int v2, DWORD partner, DWORD seg1, DWORD
newseg.planefront = true;
newseg.hashnext = NULL;
newseg.storedseg = DWORD_MAX;
newseg.frontsector = NULL;
newseg.backsector = NULL;
newseg.frontsector = -1;
newseg.backsector = -1;
newseg.offset = 0;
newseg.angle = 0;