summaryrefslogtreecommitdiff
path: root/src/cat
diff options
context:
space:
mode:
authorjacob1 <jfu614@gmail.com>2012-09-06 23:49:50 (GMT)
committer Simon Robertshaw <simon@hardwired.org.uk>2012-09-06 23:53:29 (GMT)
commit5a91b83875c8a25e36ecdcddb6c79de61125da39 (patch)
treefdaa6d76756ca7164f913726fdeba22ec1aef4be /src/cat
parent710583f0fc00184e15404d4551abf9a424275452 (diff)
downloadpowder-5a91b83875c8a25e36ecdcddb6c79de61125da39.zip
powder-5a91b83875c8a25e36ecdcddb6c79de61125da39.tar.gz
revert changing the lua/sdl includes and min/max changes
Diffstat (limited to 'src/cat')
-rw-r--r--src/cat/LuaBit.cpp6
-rw-r--r--src/cat/LuaButton.cpp6
-rw-r--r--src/cat/LuaButton.h6
-rw-r--r--src/cat/LuaComponent.cpp6
-rw-r--r--src/cat/LuaComponent.h6
-rw-r--r--src/cat/LuaLabel.cpp6
-rw-r--r--src/cat/LuaLabel.h6
-rw-r--r--src/cat/LuaLuna.h4
-rw-r--r--src/cat/LuaScriptInterface.h6
-rw-r--r--src/cat/LuaTextbox.cpp6
-rw-r--r--src/cat/LuaTextbox.h6
-rw-r--r--src/cat/LuaWindow.cpp6
-rw-r--r--src/cat/LuaWindow.h6
13 files changed, 38 insertions, 38 deletions
diff --git a/src/cat/LuaBit.cpp b/src/cat/LuaBit.cpp
index 349c2e4..c55f45a 100644
--- a/src/cat/LuaBit.cpp
+++ b/src/cat/LuaBit.cpp
@@ -30,9 +30,9 @@
extern "C"
{
-#include "lua5.1/lua.h"
-#include "lua5.1/lauxlib.h"
-#include "lua5.1/lualib.h"
+#include "lua.h"
+#include "lauxlib.h"
+#include "lualib.h"
}
#ifdef _MSC_VER
diff --git a/src/cat/LuaButton.cpp b/src/cat/LuaButton.cpp
index a4fd1e7..01ca875 100644
--- a/src/cat/LuaButton.cpp
+++ b/src/cat/LuaButton.cpp
@@ -1,8 +1,8 @@
extern "C"
{
-#include "lua5.1/lua.h"
-#include "lua5.1/lauxlib.h"
-#include "lua5.1/lualib.h"
+#include "lua.h"
+#include "lauxlib.h"
+#include "lualib.h"
}
#include <iostream>
diff --git a/src/cat/LuaButton.h b/src/cat/LuaButton.h
index 5d0e936..012779d 100644
--- a/src/cat/LuaButton.h
+++ b/src/cat/LuaButton.h
@@ -1,9 +1,9 @@
#pragma once
extern "C" {
- #include "lua5.1/lua.h"
- #include "lua5.1/lauxlib.h"
- #include "lua5.1/lualib.h"
+ #include "lua.h"
+ #include "lauxlib.h"
+ #include "lualib.h"
}
#include "LuaLuna.h"
diff --git a/src/cat/LuaComponent.cpp b/src/cat/LuaComponent.cpp
index d943c1a..8c2d3a4 100644
--- a/src/cat/LuaComponent.cpp
+++ b/src/cat/LuaComponent.cpp
@@ -1,8 +1,8 @@
extern "C"
{
-#include "lua5.1/lua.h"
-#include "lua5.1/lauxlib.h"
-#include "lua5.1/lualib.h"
+#include "lua.h"
+#include "lauxlib.h"
+#include "lualib.h"
}
#include <iostream>
diff --git a/src/cat/LuaComponent.h b/src/cat/LuaComponent.h
index ff0ca2a..9e11b12 100644
--- a/src/cat/LuaComponent.h
+++ b/src/cat/LuaComponent.h
@@ -1,9 +1,9 @@
#pragma once
extern "C" {
- #include "lua5.1/lua.h"
- #include "lua5.1/lauxlib.h"
- #include "lua5.1/lualib.h"
+ #include "lua.h"
+ #include "lauxlib.h"
+ #include "lualib.h"
}
#include "LuaLuna.h"
diff --git a/src/cat/LuaLabel.cpp b/src/cat/LuaLabel.cpp
index f37219d..e2ca56d 100644
--- a/src/cat/LuaLabel.cpp
+++ b/src/cat/LuaLabel.cpp
@@ -1,8 +1,8 @@
extern "C"
{
-#include "lua5.1/lua.h"
-#include "lua5.1/lauxlib.h"
-#include "lua5.1/lualib.h"
+#include "lua.h"
+#include "lauxlib.h"
+#include "lualib.h"
}
#include <iostream>
diff --git a/src/cat/LuaLabel.h b/src/cat/LuaLabel.h
index 74e31b8..a80ea4f 100644
--- a/src/cat/LuaLabel.h
+++ b/src/cat/LuaLabel.h
@@ -1,9 +1,9 @@
#pragma once
extern "C" {
- #include "lua5.1/lua.h"
- #include "lua5.1/lauxlib.h"
- #include "lua5.1/lualib.h"
+ #include "lua.h"
+ #include "lauxlib.h"
+ #include "lualib.h"
}
#include "LuaLuna.h"
diff --git a/src/cat/LuaLuna.h b/src/cat/LuaLuna.h
index b5bf7ac..1d5d937 100644
--- a/src/cat/LuaLuna.h
+++ b/src/cat/LuaLuna.h
@@ -2,8 +2,8 @@
//http://lua-users.org/wiki/SimplerCppBinding
extern "C" {
-#include "lua5.1/lua.h"
-#include "lua5.1/lauxlib.h"
+#include "lua.h"
+#include "lauxlib.h"
}
template <typename T> class Luna
diff --git a/src/cat/LuaScriptInterface.h b/src/cat/LuaScriptInterface.h
index f7ebb04..5bee8e1 100644
--- a/src/cat/LuaScriptInterface.h
+++ b/src/cat/LuaScriptInterface.h
@@ -10,9 +10,9 @@
extern "C"
{
-#include "lua5.1/lua.h"
-#include "lua5.1/lauxlib.h"
-#include "lua5.1/lualib.h"
+#include "lua.h"
+#include "lauxlib.h"
+#include "lualib.h"
}
#include "CommandInterface.h"
diff --git a/src/cat/LuaTextbox.cpp b/src/cat/LuaTextbox.cpp
index e3a20ba..fa5753c 100644
--- a/src/cat/LuaTextbox.cpp
+++ b/src/cat/LuaTextbox.cpp
@@ -1,8 +1,8 @@
extern "C"
{
-#include "lua5.1/lua.h"
-#include "lua5.1/lauxlib.h"
-#include "lua5.1/lualib.h"
+#include "lua.h"
+#include "lauxlib.h"
+#include "lualib.h"
}
#include <iostream>
diff --git a/src/cat/LuaTextbox.h b/src/cat/LuaTextbox.h
index 2c6b0bd..437875f 100644
--- a/src/cat/LuaTextbox.h
+++ b/src/cat/LuaTextbox.h
@@ -1,9 +1,9 @@
#pragma once
extern "C" {
- #include "lua5.1/lua.h"
- #include "lua5.1/lauxlib.h"
- #include "lua5.1/lualib.h"
+ #include "lua.h"
+ #include "lauxlib.h"
+ #include "lualib.h"
}
#include "LuaLuna.h"
diff --git a/src/cat/LuaWindow.cpp b/src/cat/LuaWindow.cpp
index c3f193b..16553d8 100644
--- a/src/cat/LuaWindow.cpp
+++ b/src/cat/LuaWindow.cpp
@@ -1,8 +1,8 @@
extern "C"
{
-#include "lua5.1/lua.h"
-#include "lua5.1/lauxlib.h"
-#include "lua5.1/lualib.h"
+#include "lua.h"
+#include "lauxlib.h"
+#include "lualib.h"
}
#include <iostream>
diff --git a/src/cat/LuaWindow.h b/src/cat/LuaWindow.h
index 55db229..be6af92 100644
--- a/src/cat/LuaWindow.h
+++ b/src/cat/LuaWindow.h
@@ -1,9 +1,9 @@
#pragma once
extern "C" {
- #include "lua5.1/lua.h"
- #include "lua5.1/lauxlib.h"
- #include "lua5.1/lualib.h"
+ #include "lua.h"
+ #include "lauxlib.h"
+ #include "lualib.h"
}
#include "LuaLuna.h"