From 3feac393b0c951c53d96181b320dd42f5c725f35 Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Mon, 18 Oct 2010 17:12:00 +0000 Subject: SWORD25: Renamed Lua .c files to .cpp and make it compilable svn-id: r53568 --- engines/sword25/math/vertex.cpp | 7 ------- engines/sword25/math/vertex.h | 10 +--------- 2 files changed, 1 insertion(+), 16 deletions(-) (limited to 'engines/sword25/math') diff --git a/engines/sword25/math/vertex.cpp b/engines/sword25/math/vertex.cpp index 4997da09d3..d9a709ab49 100644 --- a/engines/sword25/math/vertex.cpp +++ b/engines/sword25/math/vertex.cpp @@ -34,15 +34,8 @@ #include "sword25/math/vertex.h" -namespace Lua { - -extern "C" -{ #include "sword25/util/lua/lua.h" #include "sword25/util/lua/lauxlib.h" -} - -} namespace Sword25 { diff --git a/engines/sword25/math/vertex.h b/engines/sword25/math/vertex.h index 18ea4c082c..b923841a0f 100644 --- a/engines/sword25/math/vertex.h +++ b/engines/sword25/math/vertex.h @@ -45,6 +45,7 @@ // Includes #include #include "sword25/kernel/common.h" +#include "sword25/util/lua/lua.h" #if defined(MACOSX) || defined(SOLARIS) || defined(__MINGW32__) // Older versions of Mac OS X didn't supply a powf function, so using it @@ -63,15 +64,6 @@ #define atan2f(x,y) ((float)atan2(x,y)) #endif -namespace Lua { - -// Forward declarations -struct lua_State; - -} - -using namespace Lua; - namespace Sword25 { /** -- cgit v1.2.3