Browse Source

Fixed compile errors with xcode.

Made the TypeMethods, TypeGetters, and TypeSetters as extern in the .h files.

Fixed some bad copy+paste in Colourf.cpp
Nate Starkey 13 years ago
parent
commit
d033adbd1b

+ 3 - 3
Source/Core/Lua/Colourb.h

@@ -57,9 +57,9 @@ int ColourbSetAttrblue(lua_State* L);
 int ColourbSetAttralpha(lua_State* L);
 int ColourbSetAttrrgba(lua_State* L);
 
-RegType<Colourb> ColourbMethods[];
-luaL_reg ColourbGetters[];
-luaL_reg ColourbSetters[];
+extern RegType<Colourb> ColourbMethods[];
+extern luaL_reg ColourbGetters[];
+extern luaL_reg ColourbSetters[];
 
 LUATYPEDECLARE(Colourb)
 }

+ 2 - 2
Source/Core/Lua/Colourf.cpp

@@ -139,7 +139,7 @@ int ColourfSetAttrblue(lua_State* L)
     Colourf* obj = LuaType<Colourf>::check(L,1);
     LUACHECKOBJ(obj);
     float blue = (float)luaL_checknumber(L,2);
-    obj->blue;
+    obj->blue = blue;
     return 0;
 }
 
@@ -148,7 +148,7 @@ int ColourfSetAttralpha(lua_State* L)
     Colourf* obj = LuaType<Colourf>::check(L,1);
     LUACHECKOBJ(obj);
     float alpha = (float)luaL_checknumber(L,2);
-    obj->alpha;
+    obj->alpha = alpha;
     return 0;
 }
 

+ 3 - 3
Source/Core/Lua/Colourf.h

@@ -55,9 +55,9 @@ int ColourfSetAttrblue(lua_State* L);
 int ColourfSetAttralpha(lua_State* L);
 int ColourfSetAttrrgba(lua_State* L);
 
-RegType<Colourf> ColourfMethods[];
-luaL_reg ColourfGetters[];
-luaL_reg ColourfSetters[];
+extern RegType<Colourf> ColourfMethods[];
+extern luaL_reg ColourfGetters[];
+extern luaL_reg ColourfSetters[];
 
 LUATYPEDECLARE(Colourf)
 }

+ 3 - 3
Source/Core/Lua/Context.h

@@ -64,9 +64,9 @@ int ContextGetAttrroot_element(lua_State* L);
 int ContextSetAttrdimensions(lua_State* L);
 
 
-RegType<Context> ContextMethods[];
-luaL_reg ContextGetters[];
-luaL_reg ContextSetters[];
+extern RegType<Context> ContextMethods[];
+extern luaL_reg ContextGetters[];
+extern luaL_reg ContextSetters[];
 
 LUATYPEDECLARE(Context)
 }

+ 3 - 3
Source/Core/Lua/ContextDocumentsProxy.h

@@ -43,9 +43,9 @@ int ContextDocumentsProxy__index(lua_State* L);
 int ContextDocumentsProxy__pairs(lua_State* L);
 int ContextDocumentsProxy__ipairs(lua_State* L);
 
-RegType<ContextDocumentsProxy> ContextDocumentsProxyMethods[];
-luaL_reg ContextDocumentsProxyGetters[];
-luaL_reg ContextDocumentsProxySetters[];
+extern RegType<ContextDocumentsProxy> ContextDocumentsProxyMethods[];
+extern luaL_reg ContextDocumentsProxyGetters[];
+extern luaL_reg ContextDocumentsProxySetters[];
 
 LUATYPEDECLARE(ContextDocumentsProxy)
 }

+ 3 - 3
Source/Core/Lua/Document.h

@@ -56,9 +56,9 @@ int DocumentGetAttrcontext(lua_State* L);
 //setters
 int DocumentSetAttrtitle(lua_State* L);
 
-RegType<Document> DocumentMethods[];
-luaL_reg DocumentGetters[];
-luaL_reg DocumentSetters[];
+extern RegType<Document> DocumentMethods[];
+extern luaL_reg DocumentGetters[];
+extern luaL_reg DocumentSetters[];
 
 LUATYPEDECLARE(Document)
 }

+ 1 - 1
Source/Core/Lua/Element.cpp

@@ -27,7 +27,7 @@
  
 #include "precompiled.h"
 #include "Element.h"
-#include <ElementStyle.h>
+#include <../Source/Core/ElementStyle.h>
 #include "LuaEventListener.h"
 #include "ElementAttributesProxy.h"
 #include "ElementChildNodesProxy.h"

+ 3 - 3
Source/Core/Lua/Element.h

@@ -96,9 +96,9 @@ int ElementSetAttrscroll_top(lua_State* L);
 
 
 
-RegType<Element> ElementMethods[];
-luaL_reg ElementGetters[];
-luaL_reg ElementSetters[];
+extern RegType<Element> ElementMethods[];
+extern luaL_reg ElementGetters[];
+extern luaL_reg ElementSetters[];
 
 LUATYPEDECLARE(Element)
 }

+ 3 - 3
Source/Core/Lua/ElementAttributesProxy.h

@@ -43,9 +43,9 @@ int ElementAttributesProxy__index(lua_State* L);
 int ElementAttributesProxy__pairs(lua_State* L);
 int ElementAttributesProxy__ipairs(lua_State* L);
 
-RegType<ElementAttributesProxy> ElementAttributesProxyMethods[];
-luaL_reg ElementAttributesProxyGetters[];
-luaL_reg ElementAttributesProxySetters[];
+extern RegType<ElementAttributesProxy> ElementAttributesProxyMethods[];
+extern luaL_reg ElementAttributesProxyGetters[];
+extern luaL_reg ElementAttributesProxySetters[];
 
 LUATYPEDECLARE(ElementAttributesProxy)
 }

+ 3 - 3
Source/Core/Lua/ElementChildNodesProxy.h

@@ -44,9 +44,9 @@ int ElementChildNodesProxy__index(lua_State* L);
 int ElementChildNodesProxy__pairs(lua_State* L);
 int ElementChildNodesProxy__ipairs(lua_State* L);
 
-RegType<ElementChildNodesProxy> ElementChildNodesProxyMethods[];
-luaL_reg ElementChildNodesProxyGetters[];
-luaL_reg ElementChildNodesProxySetters[];
+extern RegType<ElementChildNodesProxy> ElementChildNodesProxyMethods[];
+extern luaL_reg ElementChildNodesProxyGetters[];
+extern luaL_reg ElementChildNodesProxySetters[];
 
 LUATYPEDECLARE(ElementChildNodesProxy)
 }

+ 3 - 3
Source/Core/Lua/ElementInstancer.h

@@ -41,9 +41,9 @@ int ElementInstancernew(lua_State* L);
 //setter
 int ElementInstancerSetAttrInstanceElement(lua_State* L);
 
-RegType<ElementInstancer> ElementInstancerMethods[];
-luaL_reg ElementInstancerGetters[];
-luaL_reg ElementInstancerSetters[];
+extern RegType<ElementInstancer> ElementInstancerMethods[];
+extern luaL_reg ElementInstancerGetters[];
+extern luaL_reg ElementInstancerSetters[];
 
 LUATYPEDECLARE(ElementInstancer)
 }

+ 1 - 1
Source/Core/Lua/ElementStyle.cpp

@@ -29,7 +29,7 @@
 #include <Rocket/Core/Lua/LuaType.h>
 #include <Rocket/Core/Lua/lua.hpp>
 #include "ElementStyle.h"
-#include <ElementStyle.h>
+#include <../Source/Core/ElementStyle.h>
 
 namespace Rocket {
 namespace Core {

+ 4 - 4
Source/Core/Lua/ElementStyle.h

@@ -30,7 +30,7 @@
 
 #include <Rocket/Core/Lua/LuaType.h>
 #include <Rocket/Core/Lua/lua.hpp>
-#include <ElementStyle.h>
+#include <../Source/Core/ElementStyle.h>
 
 namespace Rocket {
 namespace Core {
@@ -41,9 +41,9 @@ int ElementStyle__newindex(lua_State* L);
 int ElementStyle__pairs(lua_State* L);
 int ElementStyle__ipairs(lua_State* L);
 
-RegType<ElementStyle> ElementStyleMethods[];
-luaL_reg ElementStyleGetters[];
-luaL_reg ElementStyleSetters[];
+extern RegType<ElementStyle> ElementStyleMethods[];
+extern luaL_reg ElementStyleGetters[];
+extern luaL_reg ElementStyleSetters[];
 
 LUATYPEDECLARE(ElementStyle)
 }

+ 2 - 1
Source/Core/Lua/ElementText.cpp

@@ -45,7 +45,8 @@ int ElementTextGetAttrtext(lua_State* L)
 {
     ElementText* obj = LuaType<ElementText>::check(L, 1);
     LUACHECKOBJ(obj);
-    lua_pushstring(L,obj->GetText().ToUTF8(String()).CString());
+    String temp;
+    lua_pushstring(L,obj->GetText().ToUTF8(temp).CString());
     return 1;
 }
 

+ 3 - 3
Source/Core/Lua/ElementText.h

@@ -41,9 +41,9 @@ template<> void ExtraInit<ElementText>(lua_State* L, int metatable_index);
 int ElementTextGetAttrtext(lua_State* L);
 int ElementTextSetAttrtext(lua_State* L);
 
-RegType<ElementText> ElementTextMethods[];
-luaL_reg ElementTextGetters[];
-luaL_reg ElementTextSetters[];
+extern RegType<ElementText> ElementTextMethods[];
+extern luaL_reg ElementTextGetters[];
+extern luaL_reg ElementTextSetters[];
 
 LUATYPEDECLARE(ElementText)
 }

+ 3 - 3
Source/Core/Lua/Event.h

@@ -44,9 +44,9 @@ int EventGetAttrtype(lua_State* L);
 int EventGetAttrtarget_element(lua_State* L);
 int EventGetAttrparameters(lua_State* L);
 
-RegType<Event> EventMethods[];
-luaL_reg EventGetters[];
-luaL_reg EventSetters[];
+extern RegType<Event> EventMethods[];
+extern luaL_reg EventGetters[];
+extern luaL_reg EventSetters[];
 
 LUATYPEDECLARE(Event)
 }

+ 3 - 3
Source/Core/Lua/EventParametersProxy.h

@@ -43,9 +43,9 @@ int EventParametersProxy__index(lua_State* L);
 int EventParametersProxy__pairs(lua_State* L);
 int EventParametersProxy__ipairs(lua_State* L);
 
-RegType<EventParametersProxy> EventParametersProxyMethods[];
-luaL_reg EventParametersProxyGetters[];
-luaL_reg EventParametersProxySetters[];
+extern RegType<EventParametersProxy> EventParametersProxyMethods[];
+extern luaL_reg EventParametersProxyGetters[];
+extern luaL_reg EventParametersProxySetters[];
 
 LUATYPEDECLARE(EventParametersProxy)
 }

+ 1 - 1
Source/Core/Lua/Interpreter.cpp

@@ -35,7 +35,7 @@
 #include <Rocket/Core/Factory.h>
 #include "LuaEventListenerInstancer.h"
 #include "Rocket.h"
-#include <ElementStyle.h>
+#include <../Source/Core/ElementStyle.h>
 //the types I made
 #include "ContextDocumentsProxy.h"
 #include "EventParametersProxy.h"

+ 3 - 3
Source/Core/Lua/Log.h

@@ -35,9 +35,9 @@ namespace Lua {
 template<> void ExtraInit<Log>(lua_State* L, int metatable_index);
 int LogMessage(lua_State* L);
 
-RegType<Log> LogMethods[];
-luaL_reg LogGetters[];
-luaL_reg LogSetters[];
+extern RegType<Log> LogMethods[];
+extern luaL_reg LogGetters[];
+extern luaL_reg LogSetters[];
 
 LUATYPEDECLARE(Log)
 }

+ 3 - 3
Source/Core/Lua/Rocket.h

@@ -50,9 +50,9 @@ int LuaRocketGetAttrcontexts(lua_State* L);
 void LuaRocketEnumkey_identifier(lua_State* L);
 void LuaRocketEnumkey_modifier(lua_State* L);
 
-RegType<LuaRocket> LuaRocketMethods[];
-luaL_reg LuaRocketGetters[];
-luaL_reg LuaRocketSetters[];
+extern RegType<LuaRocket> LuaRocketMethods[];
+extern luaL_reg LuaRocketGetters[];
+extern luaL_reg LuaRocketSetters[];
 
 LUATYPEDECLARE(LuaRocket)
 }

+ 3 - 3
Source/Core/Lua/RocketContextsProxy.h

@@ -43,9 +43,9 @@ int RocketContextsProxy__index(lua_State* L);
 int RocketContextsProxy__pairs(lua_State* L);
 int RocketContextsProxy__ipairs(lua_State* L);
 
-RegType<RocketContextsProxy> RocketContextsProxyMethods[];
-luaL_reg RocketContextsProxyGetters[];
-luaL_reg RocketContextsProxySetters[];
+extern RegType<RocketContextsProxy> RocketContextsProxyMethods[];
+extern luaL_reg RocketContextsProxyGetters[];
+extern luaL_reg RocketContextsProxySetters[];
 
 LUATYPEDECLARE(RocketContextsProxy)
 }

+ 3 - 3
Source/Core/Lua/Vector2f.h

@@ -57,9 +57,9 @@ int Vector2fSetAttrx(lua_State*L);
 int Vector2fSetAttry(lua_State*L);
 
 
-RegType<Vector2f> Vector2fMethods[];
-luaL_reg Vector2fGetters[];
-luaL_reg Vector2fSetters[];
+extern RegType<Vector2f> Vector2fMethods[];
+extern luaL_reg Vector2fGetters[];
+extern luaL_reg Vector2fSetters[];
 
 LUATYPEDECLARE(Vector2f)
 }

+ 3 - 3
Source/Core/Lua/Vector2i.h

@@ -54,9 +54,9 @@ int Vector2iSetAttrx(lua_State*L);
 int Vector2iSetAttry(lua_State*L);
 
 
-RegType<Vector2i> Vector2iMethods[];
-luaL_reg Vector2iGetters[];
-luaL_reg Vector2iSetters[];
+extern RegType<Vector2i> Vector2iMethods[];
+extern luaL_reg Vector2iGetters[];
+extern luaL_reg Vector2iSetters[];
 
 LUATYPEDECLARE(Vector2i)
 }