Visual studio compatibility

This removes some inlines when using visual studio to compile, uisng TPT_NO_INLINE. It also fixes many other problems visual studio has with the code

14 files changed, 56 insertions, 38 deletions

diff --git a/src/cat/CommandInterface.cpp b/src/cat/CommandInterface.cpp
index 7c6dd83..240e7e4 100644
--- a/src/cat/CommandInterface.cpp
+++ b/src/cat/CommandInterface.cpp
@@ -8,7 +8,9 @@
 #include <iostream>
 #include <string>
 #include <string.h>
+#if !defined(WIN) || defined(__GNUC__)
 #include <strings.h>
+#endif
 #include "CommandInterface.h"
 #include "game/GameModel.h"
 #include "game/GameController.h"
diff --git a/src/cat/LuaBit.cpp b/src/cat/LuaBit.cpp
index c55f45a..349c2e4 100644
--- a/src/cat/LuaBit.cpp
+++ b/src/cat/LuaBit.cpp
@@ -30,9 +30,9 @@
 
 extern "C"
 {
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
+#include "lua5.1/lua.h"
+#include "lua5.1/lauxlib.h"
+#include "lua5.1/lualib.h"
 }
 
 #ifdef _MSC_VER
diff --git a/src/cat/LuaButton.cpp b/src/cat/LuaButton.cpp
index 59890f2..a4fd1e7 100644
--- a/src/cat/LuaButton.cpp
+++ b/src/cat/LuaButton.cpp
@@ -1,8 +1,8 @@
 extern "C"
 {
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
+#include "lua5.1/lua.h"
+#include "lua5.1/lauxlib.h"
+#include "lua5.1/lualib.h"
 }
 
 #include <iostream>
@@ -77,6 +77,7 @@ int LuaButton::action(lua_State * l)
 	{
 		actionFunction = 0;
 	}
+	return 0;
 }
 
 int LuaButton::text(lua_State * l)
diff --git a/src/cat/LuaButton.h b/src/cat/LuaButton.h
index 012779d..5d0e936 100644
--- a/src/cat/LuaButton.h
+++ b/src/cat/LuaButton.h
@@ -1,9 +1,9 @@
 #pragma once
 
 extern "C" {
-	#include "lua.h"
-	#include "lauxlib.h"
-	#include "lualib.h"
+	#include "lua5.1/lua.h"
+	#include "lua5.1/lauxlib.h"
+	#include "lua5.1/lualib.h"
 }
 
 #include "LuaLuna.h"
diff --git a/src/cat/LuaComponent.cpp b/src/cat/LuaComponent.cpp
index 8c2d3a4..d943c1a 100644
--- a/src/cat/LuaComponent.cpp
+++ b/src/cat/LuaComponent.cpp
@@ -1,8 +1,8 @@
 extern "C"
 {
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
+#include "lua5.1/lua.h"
+#include "lua5.1/lauxlib.h"
+#include "lua5.1/lualib.h"
 }
 
 #include <iostream>
diff --git a/src/cat/LuaComponent.h b/src/cat/LuaComponent.h
index 9e11b12..ff0ca2a 100644
--- a/src/cat/LuaComponent.h
+++ b/src/cat/LuaComponent.h
@@ -1,9 +1,9 @@
 #pragma once
 
 extern "C" {
-	#include "lua.h"
-	#include "lauxlib.h"
-	#include "lualib.h"
+	#include "lua5.1/lua.h"
+	#include "lua5.1/lauxlib.h"
+	#include "lua5.1/lualib.h"
 }
 
 #include "LuaLuna.h"
diff --git a/src/cat/LuaLabel.cpp b/src/cat/LuaLabel.cpp
index e2ca56d..f37219d 100644
--- a/src/cat/LuaLabel.cpp
+++ b/src/cat/LuaLabel.cpp
@@ -1,8 +1,8 @@
 extern "C"
 {
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
+#include "lua5.1/lua.h"
+#include "lua5.1/lauxlib.h"
+#include "lua5.1/lualib.h"
 }
 
 #include <iostream>
diff --git a/src/cat/LuaLabel.h b/src/cat/LuaLabel.h
index a80ea4f..74e31b8 100644
--- a/src/cat/LuaLabel.h
+++ b/src/cat/LuaLabel.h
@@ -1,9 +1,9 @@
 #pragma once
 
 extern "C" {
-	#include "lua.h"
-	#include "lauxlib.h"
-	#include "lualib.h"
+	#include "lua5.1/lua.h"
+	#include "lua5.1/lauxlib.h"
+	#include "lua5.1/lualib.h"
 }
 
 #include "LuaLuna.h"
diff --git a/src/cat/LuaLuna.h b/src/cat/LuaLuna.h
index 1d5d937..b5bf7ac 100644
--- a/src/cat/LuaLuna.h
+++ b/src/cat/LuaLuna.h
@@ -2,8 +2,8 @@
 //http://lua-users.org/wiki/SimplerCppBinding
 
 extern "C" {
-#include "lua.h"
-#include "lauxlib.h"
+#include "lua5.1/lua.h"
+#include "lua5.1/lauxlib.h"
 }
 
 template <typename T> class Luna
diff --git a/src/cat/LuaScriptInterface.h b/src/cat/LuaScriptInterface.h
index 5bee8e1..f7ebb04 100644
--- a/src/cat/LuaScriptInterface.h
+++ b/src/cat/LuaScriptInterface.h
@@ -10,9 +10,9 @@
 
 extern "C"
 {
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
+#include "lua5.1/lua.h"
+#include "lua5.1/lauxlib.h"
+#include "lua5.1/lualib.h"
 }
 
 #include "CommandInterface.h"
diff --git a/src/cat/LuaTextbox.cpp b/src/cat/LuaTextbox.cpp
index a8abf9e..e3a20ba 100644
--- a/src/cat/LuaTextbox.cpp
+++ b/src/cat/LuaTextbox.cpp
@@ -1,8 +1,8 @@
 extern "C"
 {
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
+#include "lua5.1/lua.h"
+#include "lua5.1/lauxlib.h"
+#include "lua5.1/lualib.h"
 }
 
 #include <iostream>
@@ -79,6 +79,7 @@ int LuaTextbox::onTextChanged(lua_State * l)
 	{
 		onTextChangedFunction = 0;
 	}
+	return 0;
 }
 
 void LuaTextbox::triggerOnTextChanged()
diff --git a/src/cat/LuaTextbox.h b/src/cat/LuaTextbox.h
index 437875f..2c6b0bd 100644
--- a/src/cat/LuaTextbox.h
+++ b/src/cat/LuaTextbox.h
@@ -1,9 +1,9 @@
 #pragma once
 
 extern "C" {
-	#include "lua.h"
-	#include "lauxlib.h"
-	#include "lualib.h"
+	#include "lua5.1/lua.h"
+	#include "lua5.1/lauxlib.h"
+	#include "lua5.1/lualib.h"
 }
 
 #include "LuaLuna.h"
diff --git a/src/cat/LuaWindow.cpp b/src/cat/LuaWindow.cpp
index 06b29c8..c3f193b 100644
--- a/src/cat/LuaWindow.cpp
+++ b/src/cat/LuaWindow.cpp
@@ -1,8 +1,8 @@
 extern "C"
 {
-#include "lua.h"
-#include "lauxlib.h"
-#include "lualib.h"
+#include "lua5.1/lua.h"
+#include "lua5.1/lauxlib.h"
+#include "lua5.1/lualib.h"
 }
 
 #include <iostream>
@@ -353,6 +353,7 @@ int LuaWindow::onInitialized(lua_State * l)
 	{
 		onInitializedFunction = 0;
 	}
+	return 0;
 }
 
 int LuaWindow::onExit(lua_State * l)
@@ -367,6 +368,7 @@ int LuaWindow::onExit(lua_State * l)
 	{
 		onExitFunction = 0;
 	}
+	return 0;
 }
 
 int LuaWindow::onTick(lua_State * l)
@@ -381,6 +383,7 @@ int LuaWindow::onTick(lua_State * l)
 	{
 		onTickFunction = 0;
 	}
+	return 0;
 }
 
 int LuaWindow::onDraw(lua_State * l)
@@ -395,6 +398,7 @@ int LuaWindow::onDraw(lua_State * l)
 	{
 		onDrawFunction = 0;
 	}
+	return 0;
 }
 
 int LuaWindow::onFocus(lua_State * l)
@@ -409,6 +413,7 @@ int LuaWindow::onFocus(lua_State * l)
 	{
 		onFocusFunction = 0;
 	}
+	return 0;
 }
 
 int LuaWindow::onBlur(lua_State * l)
@@ -423,6 +428,7 @@ int LuaWindow::onBlur(lua_State * l)
 	{
 		onBlurFunction = 0;
 	}
+	return 0;
 }
 
 int LuaWindow::onTryExit(lua_State * l)
@@ -437,6 +443,7 @@ int LuaWindow::onTryExit(lua_State * l)
 	{
 		onTryExitFunction = 0;
 	}
+	return 0;
 }
 
 int LuaWindow::onTryOkay(lua_State * l)
@@ -451,6 +458,7 @@ int LuaWindow::onTryOkay(lua_State * l)
 	{
 		onTryOkayFunction = 0;
 	}
+	return 0;
 }
 
 int LuaWindow::onMouseMove(lua_State * l)
@@ -465,6 +473,7 @@ int LuaWindow::onMouseMove(lua_State * l)
 	{
 		onMouseMoveFunction = 0;
 	}
+	return 0;
 }
 
 int LuaWindow::onMouseDown(lua_State * l)
@@ -479,6 +488,7 @@ int LuaWindow::onMouseDown(lua_State * l)
 	{
 		onMouseDownFunction = 0;
 	}
+	return 0;
 }
 
 int LuaWindow::onMouseUp(lua_State * l)
@@ -493,6 +503,7 @@ int LuaWindow::onMouseUp(lua_State * l)
 	{
 		onMouseUpFunction = 0;
 	}
+	return 0;
 }
 
 int LuaWindow::onMouseWheel(lua_State * l)
@@ -507,6 +518,7 @@ int LuaWindow::onMouseWheel(lua_State * l)
 	{
 		onMouseWheelFunction = 0;
 	}
+	return 0;
 }
 
 int LuaWindow::onKeyPress(lua_State * l)
@@ -521,6 +533,7 @@ int LuaWindow::onKeyPress(lua_State * l)
 	{
 		onKeyPressFunction = 0;
 	}
+	return 0;
 }
 
 int LuaWindow::onKeyRelease(lua_State * l)
@@ -535,6 +548,7 @@ int LuaWindow::onKeyRelease(lua_State * l)
 	{
 		onKeyReleaseFunction = 0;
 	}
+	return 0;
 }
 
 
diff --git a/src/cat/LuaWindow.h b/src/cat/LuaWindow.h
index be6af92..55db229 100644
--- a/src/cat/LuaWindow.h
+++ b/src/cat/LuaWindow.h
@@ -1,9 +1,9 @@
 #pragma once
 
 extern "C" {
-	#include "lua.h"
-	#include "lauxlib.h"
-	#include "lualib.h"
+	#include "lua5.1/lua.h"
+	#include "lua5.1/lauxlib.h"
+	#include "lua5.1/lualib.h"
 }
 
 #include "LuaLuna.h"