From 67aa042dcbf9938896f20f47d2a778761efa4dcc Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Mon, 1 Sep 2008 17:30:20 +0000 Subject: compile fixes for windows --- datasrc/datatypes.py | 14 +++++++++----- src/game/client/gc_render.cpp | 1 - src/game/editor/ed_editor.cpp | 1 - 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/datasrc/datatypes.py b/datasrc/datatypes.py index 0b83493f..2b1e3e82 100644 --- a/datasrc/datatypes.py +++ b/datasrc/datatypes.py @@ -94,11 +94,15 @@ class Array(BaseType): lines += item.EmitPreDefinition("%s[%d]"%(self.Identifyer(), i)) i += 1 - lines += ["static %s %s[] = {"%(self.TypeName(), self.Identifyer())] - for item in self.items: - itemlines = item.EmitDefinition("") - lines += ["\t" + " ".join(itemlines).replace("\t", " ") + ","] - lines += ["};"] + if len(self.items): + lines += ["static %s %s[] = {"%(self.TypeName(), self.Identifyer())] + for item in self.items: + itemlines = item.EmitDefinition("") + lines += ["\t" + " ".join(itemlines).replace("\t", " ") + ","] + lines += ["};"] + else: + lines += ["static %s *%s = 0;"%(self.TypeName(), self.Identifyer())] + return lines def EmitDefinition(self, name): return [str(len(self.items))+","+self.Identifyer()] diff --git a/src/game/client/gc_render.cpp b/src/game/client/gc_render.cpp index 4dcc4583..74cfc850 100644 --- a/src/game/client/gc_render.cpp +++ b/src/game/client/gc_render.cpp @@ -10,7 +10,6 @@ #include #include "animstate.hpp" #include "gc_render.hpp" -#include "gc_map_image.hpp" static float sprite_w_scale; static float sprite_h_scale; diff --git a/src/game/editor/ed_editor.cpp b/src/game/editor/ed_editor.cpp index 940472ce..e4e04478 100644 --- a/src/game/editor/ed_editor.cpp +++ b/src/game/editor/ed_editor.cpp @@ -12,7 +12,6 @@ extern "C" { #include } -#include #include #include #include -- cgit 1.4.1