Merge branch 'master' of git.net-core.org:darkgod/t-engine4

CREDITS

@@ -16,15 +16,17 @@ General:
 - Benli for classes, zones, ...
 - Hetdegon for Arena and other such nice things
 - Tiger Eye for auto-explore and FOV code
-- PureQuestion for npcs and artifact work
+- PureQuestion for npcs and artifacts
 - Hachem Muche for many patches and scaling issues
 - Dekar for artifacts, debug help (slave? ;> ), icons, ...
 - Shibari for artifacts and talents balancing
+- Sage Acrin
 
 Lore:
 - Darren Grey
 - Burb Lulls
 - Gwai
+- Ron Billingsley
 
 Graphics:
 - Shockbolt (Raymond Gaustadnes) http://shockbolt.deviantart.com

bootstrap/boot.lua

@@ -22,6 +22,7 @@ if __SELFEXE then
 	fs.mount(dir..fs.getPathSeparator().."game"..fs.getPathSeparator().."thirdparty", "/", true)
 	fs.mount(dir..fs.getPathSeparator().."game", "/", true)
 else
+	print("No SelfExe, using basic path")
 	fs.mount("game"..fs.getPathSeparator().."thirdparty", "/", true)
 	fs.mount("game", "/", true)
 end

build/options.lua

@@ -36,6 +36,10 @@ newoption {
 newoption {
 	trigger     = "relpath",
 	description = "Links libraries relative to the application path for redistribution",
+	allowed = {
+		{ "32",	"32 bits location" },
+		{ "64",	"64 bits location" },
+	}
 }
 newoption {
 	trigger     = "luaassert",
@@ -61,4 +65,19 @@ newoption {
 	description = "Steam integration"
 }
 
+newoption {
+	trigger	    = "web-awesomium",
+	description = "Use awesomium embedded browser as the webcore"
+}
+
+newoption {
+	trigger	    = "web-cef3",
+	description = "Use CEF3 embedded browser as the webcore"
+}
+
+newoption {
+	trigger	    = "wincross",
+	description = "Enables cross-compilation for windows (from linux)"
+}
+
 _OPTIONS.lua = _OPTIONS.lua or "jit2"

build/te4core.lua

@@ -42,6 +42,12 @@ project "TEngine"
 	defines { [[TENGINE_HOME_PATH='".t-engine"']], "TE4CORE_VERSION="..TE4CORE_VERSION }
 	buildoptions { "-O3" }
 
+	if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib "} end
+	if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN/lib64 "} end
+
+	if _OPTIONS.relpath == "32" then defines{"TE4_RELPATH32"} end
+	if _OPTIONS.relpath == "64" then defines{"TE4_RELPATH64"} end
+
 	links { "m" }
 
 	if _OPTIONS.no_rwops_size then defines{"NO_RWOPS_SIZE"} end
@@ -50,6 +56,10 @@ project "TEngine"
 		dofile("../steamworks/build/steam-build.lua")
 	end
 
+	if _OPTIONS.wincross then
+		prelinkcommands { "i686-pc-mingw32-ranlib ../bin/Debug/*.a" }
+	end
+
 	configuration "macosx"
 		files { "../src/mac/SDL*" }
 		includedirs {
@@ -83,6 +93,7 @@ project "TEngine"
 			"-framework libpng",
 			"-framework ogg",
 			"-framework vorbis",
+			"-Wl,-rpath,'@loader_path/../Frameworks'",
 		}
 		if _OPTIONS.lua == "jit2" then
 			linkoptions {
@@ -95,9 +106,13 @@ project "TEngine"
 		links { "IOKit" }
 
 	configuration "windows"
-		links { "mingw32", "SDL2main", "SDL2", "SDL2_ttf", "SDL2_image", "openal32", "vorbisfile", "OPENGL32", "GLU32", "wsock32", "png" }
+		links { "mingw32", "SDL2main", "SDL2", "SDL2_ttf", "SDL2_image", "OpenAL32", "vorbisfile", "opengl32", "glu32", "wsock32", "png" }
 		defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS'  }
-		prebuildcommands { "windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" }
+		if _OPTIONS.wincross then
+			prebuildcommands { "/usr/bin/i686-pc-mingw32-windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" }
+		else
+			prebuildcommands { "windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" }
+		end
 		linkoptions { "../src/windows/icon.res" }
 		linkoptions { "-mwindows" }
 		defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' }
@@ -114,7 +129,11 @@ project "TEngine"
 		defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' }
 
 	configuration {"Debug"}
-		postbuildcommands { "cp ../bin/Debug/t-engine ../", }
+		if _OPTIONS.wincross then
+			postbuildcommands { "cp ../bin/Debug/t-engine.exe ../", }
+		else
+			postbuildcommands { "cp ../bin/Debug/t-engine ../", }
+		end
 	configuration {"Release"}
 		postbuildcommands { "cp ../bin/Release/t-engine ../", }
 
@@ -157,10 +176,18 @@ elseif _OPTIONS.lua == "jit2" then
 		language "C"
 		targetname "minilua"
 		links { "m" }
+		if _OPTIONS.wincross then
+			links {"mingw32"}
+		end
 
 		files { "../src/luajit2/src/host/minilua.c" }
 
-		local arch_test = os.capture("gcc -E ../src/luajit2/src/lj_arch.h -dM", true)
+		local arch_test
+		if _OPTIONS.wincross then
+			arch_test = os.capture("i686-pc-mingw32-gcc -E ../src/luajit2/src/lj_arch.h -dM", true)
+		else
+			arch_test = os.capture("gcc -E ../src/luajit2/src/lj_arch.h -dM", true)
+		end
 
 		if string.find(arch_test, "LJ_TARGET_X64") then
 			target_arch = "x64"
@@ -191,8 +218,20 @@ elseif _OPTIONS.lua == "jit2" then
 		end
 
 		configuration {"Debug"}
+			if _OPTIONS.wincross then
+				postbuildcommands {
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/minilua/minilua.cross.o" -c "../src/luajit2/src/host/minilua.c"',
+					'gcc -o ../bin/Debug/minilua ../obj/Debug/minilua/minilua.cross.o  -m32 -L/usr/lib32 -L/Test/xcompile/local/lib   -lm',
+				}
+			end
 			postbuildcommands { "cp ../bin/Debug/minilua ../src/luajit2/src/host/", }
 		configuration {"Release"}
+			if _OPTIONS.wincross then
+				postbuildcommands {
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/minilua/minilua.cross.o" -c "../src/luajit2/src/host/minilua.c"',
+					'gcc -o ../bin/Release/minilua ../obj/Release/minilua/minilua.cross.o  -m32 -L/usr/lib32 -L/Test/xcompile/local/lib   -lm',
+				}
+			end
 			postbuildcommands { "cp ../bin/Release/minilua ../src/luajit2/src/host/", }
 
 	project "buildvm"
@@ -202,7 +241,12 @@ elseif _OPTIONS.lua == "jit2" then
 		links { "minilua" }
 
 		local dasm_flags = ""
-		local arch_test = os.capture("gcc -E ../src/luajit2/src/lj_arch.h -dM", true)
+		local arch_test
+		if _OPTIONS.wincross then
+			arch_test = os.capture("i686-pc-mingw32-gcc -E ../src/luajit2/src/lj_arch.h -dM", true)
+		else
+			arch_test = os.capture("gcc -E ../src/luajit2/src/lj_arch.h -dM", true)
+		end
 
 		if string.find(arch_test, "LJ_TARGET_X64") then
 			target_arch = "x64"
@@ -276,8 +320,28 @@ elseif _OPTIONS.lua == "jit2" then
 		files { "../src/luajit2/src/host/buildvm*.c" }
 
 		configuration {"Debug"}
+			if _OPTIONS.wincross then
+				postbuildcommands {
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_lib.cross.o" -c "../src/luajit2/src/host/buildvm_lib.c"',
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_asm.cross.o" -c "../src/luajit2/src/host/buildvm_asm.c"',
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_peobj.cross.o" -c "../src/luajit2/src/host/buildvm_peobj.c"',
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm_fold.cross.o" -c "../src/luajit2/src/host/buildvm_fold.c"',
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Debug/buildvm/buildvm.cross.o" -c "../src/luajit2/src/host/buildvm.c"',
+					'gcc -o ../bin/Debug/buildvm ../obj/Debug/buildvm/buildvm_lib.cross.o ../obj/Debug/buildvm/buildvm_asm.cross.o ../obj/Debug/buildvm/buildvm_peobj.cross.o ../obj/Debug/buildvm/buildvm_fold.cross.o ../obj/Debug/buildvm/buildvm.cross.o  -m32 -L/usr/lib32 -L/Test/xcompile/local/lib',
+				}
+			end
 			postbuildcommands { "cp ../bin/Debug/buildvm ../src/luajit2/src/", }
 		configuration {"Release"}
+			if _OPTIONS.wincross then
+				postbuildcommands {
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_lib.cross.o" -c "../src/luajit2/src/host/buildvm_lib.c"',
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_asm.cross.o" -c "../src/luajit2/src/host/buildvm_asm.c"',
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_peobj.cross.o" -c "../src/luajit2/src/host/buildvm_peobj.c"',
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm_fold.cross.o" -c "../src/luajit2/src/host/buildvm_fold.c"',
+					'gcc -MMD -MP -DGLEW_STATIC -DLUAJIT_TARGET=LUAJIT_ARCH_x86 -DLJ_ARCH_HASFPU=1 -DLJ_ABI_SOFTFP=0 -I../src -I../src/luasocket -I../src/fov -I../src/expat -I../src/lxp -I../src/libtcod_import -I../src/physfs -I../src/zlib -I../src/bzip2 -I../src/luajit2/src -I../src/luajit2/dynasm -g -m32 -ggdb -o "../obj/Release/buildvm/buildvm.cross.o" -c "../src/luajit2/src/host/buildvm.c"',
+					'gcc -o ../bin/Release/buildvm ../obj/Release/buildvm/buildvm_lib.cross.o ../obj/Release/buildvm/buildvm_asm.cross.o ../obj/Release/buildvm/buildvm_peobj.cross.o ../obj/Release/buildvm/buildvm_fold.cross.o ../obj/Release/buildvm/buildvm.cross.o  -m32 -L/usr/lib32 -L/Test/xcompile/local/lib',
+				}
+			end
 			postbuildcommands { "cp ../bin/Release/buildvm ../src/luajit2/src/", }
 
 	project "luajit2"
@@ -454,6 +518,43 @@ project "te4-bzip"
 
 	files { "../src/bzip2/*.c", }
 
+if _OPTIONS['web-awesomium'] and not _OPTIONS.wincross then
+project "te4-web"
+	kind "SharedLib"
+	language "C++"
+	targetname "te4-web"
+
+	libdirs {"/opt/awesomium/bin/"}
+	includedirs {"/opt/awesomium/include/"}
+	links { "awesomium-1-7" }
+	
+	files { "../src/web-awesomium/*.cpp", }
+end
+
+if _OPTIONS['web-cef3'] and not _OPTIONS.wincross then
+project "te4-web"
+	kind "SharedLib"
+	language "C++"
+	targetname "te4-web"
+
+	if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN "} end
+	if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN "} end
+
+	buildoptions{"-Wall -pthread -I/usr/include/gtk-2.0 -I/usr/lib64/gtk-2.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm"}
+	libdirs {"/opt/cef3/1547/out/Release/obj.target/", "/opt/cef3/1547/Release/"}
+	includedirs {"/opt/cef3/1547/include/", "/opt/cef3/1547/"}
+	links { "cef", "cef_dll_wrapper" }
+	
+	files { "../src/web-cef3/*.cpp", }
+
+	configuration "macosx"
+		defines { 'SELFEXE_MACOSX' }
+	configuration "windows"
+		defines { 'SELFEXE_WINDOWS' }
+	configuration "linux"
+		defines { 'SELFEXE_LINUX' }
+end
+
 if _OPTIONS.steam then
 	dofile("../steamworks/build/steam-code.lua")
 end