premake

git-svn-id: http://svn.net-core.org/repos/t-engine4@447 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/dialogs/DeathDialog.lua

@@ -117,7 +117,7 @@ end
 function _M:generateList()
 	local list = {}
 
-	if self.actor.cheat or true then list[#list+1] = {name="Resurrect by cheating", action="cheat"} end
+	if config.settings.tome.cheat then list[#list+1] = {name="Resurrect by cheating", action="cheat"} end
 	if self.actor:attr("blood_life") and not self.actor:attr("undead") then list[#list+1] = {name="Resurrect with the Blood of Life", action="blood_life"} end
 
 	list[#list+1] = {name="Character dump", action="dump"}

premake4.lua

@@ -17,7 +17,7 @@ solution "TEngine"
 	includedirs {
 		"src",
 		"src/dynasm",
-		"src/lua",
+		_OPTIONS.lua == "default" and "src/lua" or "src/luajit",
 		"src/luasocket",
 		"src/fov",
 		"src/physfs",
@@ -112,7 +112,8 @@ elseif _OPTIONS.lua == "jitx86" then
 		targetname "lua"
 
 		files { "src/luajit/*.c", }
-		defines { "LUA_USE_POSIX" }
+		configuration "linux"
+			defines { "LUA_USE_POSIX" }
 end
 
 project "luasocket"