diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 13 | ||||
| -rw-r--r-- | aur-tome4.patch | 451 |
3 files changed, 459 insertions, 14 deletions
@@ -1,6 +1,6 @@ pkgbase = tome4-git pkgdesc = An open-source, single-player, role-playing roguelike game set in the world of Eyal. - pkgver = 1.6.0.r14.g1a766e61b8 + pkgver = 1.7.2.r117.g75e65d71a1 pkgrel = 1 url = http://tome.te4.org/ arch = i686 @@ -11,11 +11,12 @@ pkgbase = tome4-git makedepends = premake makedepends = zip makedepends = unzip + makedepends = glew depends = glu depends = openal depends = libvorbis - depends = sdl2_ttf>=2.0.12 - depends = sdl2_image>=2.0.0 + depends = sdl2_ttf + depends = sdl2_image provides = tome4 conflicts = tome4-beta conflicts = tome4 @@ -27,7 +28,7 @@ pkgbase = tome4-git source = tome4 source = tome4.desktop sha256sums = SKIP - sha256sums = 37f5be7020a06228b7d22f4c622ab5a8843b4dbea7493d7e3b324bd592cd818e + sha256sums = 8e1821d1fe4bd2b48115179a83d71eaefa8b6bda70de77ca75d122d5d3053410 sha256sums = 3a1e4901337f91697bcfaf095f488c447c27ccc2484a543e31f024d5aefb61a0 sha256sums = 80e663d9eb2d41c6d9c0a6b4b5b52eb33b0872c3412a617530777fd137c0baa1 @@ -3,14 +3,14 @@ pkgname=tome4-git _pkgname=tome4 -pkgver=1.6.0.r14.g1a766e61b8 +pkgver=1.7.2.r117.g75e65d71a1 pkgrel=1 pkgdesc="An open-source, single-player, role-playing roguelike game set in the world of Eyal." arch=('i686' 'x86_64') url="http://tome.te4.org/" license=('custom' 'GPL3') -depends=('glu' 'openal' 'libvorbis' 'sdl2_ttf>=2.0.12' 'sdl2_image>=2.0.0' ) -makedepends=('git' 'premake' 'zip' 'unzip') +depends=('glu' 'openal' 'libvorbis' 'sdl2_ttf' 'sdl2_image') +makedepends=('git' 'premake' 'zip' 'unzip' 'glew') options=(!makeflags emptydirs) source=("git+http://git.net-core.org/tome/t-engine4.git" aur-${_pkgname}.patch @@ -19,11 +19,10 @@ source=("git+http://git.net-core.org/tome/t-engine4.git" provides=('tome4') conflicts=('tome4-beta' 'tome4' 'tome4-nomusic') sha256sums=('SKIP' - '37f5be7020a06228b7d22f4c622ab5a8843b4dbea7493d7e3b324bd592cd818e' + '8e1821d1fe4bd2b48115179a83d71eaefa8b6bda70de77ca75d122d5d3053410' '3a1e4901337f91697bcfaf095f488c447c27ccc2484a543e31f024d5aefb61a0' '80e663d9eb2d41c6d9c0a6b4b5b52eb33b0872c3412a617530777fd137c0baa1') - pkgver() { cd "${srcdir}/t-engine4" git describe --long --tags | sed -r 's/([^-]*-g)/r\1/;s/-/./g;s/tome.//g' @@ -35,8 +34,8 @@ pkgver() { prepare() { cd "$srcdir"/t-engine4 + cp premake4.lua premake5.lua patch -p1 < "${srcdir}/aur-${_pkgname}.patch" - sed -i "s|#include <GL/glext.h>||g" src/tgl.h } ############################################################################### @@ -44,7 +43,7 @@ prepare() { ############################################################################### build() { cd t-engine4 - premake4 gmake + premake5 gmake make config=debug } diff --git a/aur-tome4.patch b/aur-tome4.patch index 3831dfb7da0d..7c24269af30c 100644 --- a/aur-tome4.patch +++ b/aur-tome4.patch @@ -1,6 +1,378 @@ -diff -Naur orig/premake4.lua new/premake4.lua ---- orig/premake4.lua 2014-05-19 10:42:14.000000000 +0200 -+++ new/premake4.lua 2015-12-03 22:09:15.687935809 +0100 +diff -Naur orig/build/runner.lua new/build/runner.lua +--- orig/build/runner.lua 2014-05-19 10:42:12.000000000 +0200 ++++ new/build/runner.lua 2020-10-30 23:01:51.861023690 +0100 +@@ -24,28 +24,28 @@ + files { "../src/runner/main.c", "../src/getself.c" } + links { "m" } + +- configuration "linux" ++ filter "system:linux" + links { "dl", "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "GL", "GLU", "m", "pthread" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_LINUX' } + +- configuration "bsd" ++ filter "system:bsd" + links { "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "GL", "GLU", "m", "pthread" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_BSD' } + +- configuration "windows" ++ filter "system:windows" + links { "mingw32", "SDLmain", "SDL", "SDL_ttf", "SDL_image", "SDL_mixer", "OPENGL32", "GLU32", "wsock32" } +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } + prebuildcommands { "windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" } + linkoptions { "../src/windows/icon.res" } + +- configuration "macosx" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } ++ filter "system:macosx" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } + linkoptions { "-framework SDL", "-framework SDL_image", "-framework SDL_ttf", "-framework SDL_mixer", "-framework Cocoa", "-framework OpenGL" } + links { "IOKit" } + +- configuration {"Debug"} ++ filter {"Debug"} + postbuildcommands { "cp ../bin/Debug/t-engine ../t-engine", } +- configuration {"Release"} ++ filter {"Release"} + postbuildcommands { "cp ../bin/Release/t-engine ../t-engine", } + + project "te4runner" +@@ -58,19 +58,19 @@ + files { "../src/runner/runner.c", "../src/physfs.c", "../src/auxiliar.c" } + links { "runner-physfs", "runner-lua", "m" } + +- configuration "linux" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' } +- configuration "bsd" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' } +- +- configuration "windows" +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } +- configuration "macosx" +- defines { [[TENGINE_HOME_PATH='".t-engine"']], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } ++ filter "system:linux" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_LINUX' } ++ filter "system:bsd" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_BSD' } ++ ++ filter "system:windows" ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } ++ filter "system:macosx" ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], "USE_TENGINE_MAIN", 'SELFEXE_MACOSX' } + +- configuration {"Debug"} ++ filter {"Debug"} + postbuildcommands { "cp ../bin/Debug/te4runner.tec ../", } +- configuration {"Release"} ++ filter {"Release"} + postbuildcommands { "cp ../bin/Release/te4runner.tec ../", } + + project "runner-physfs" +@@ -83,13 +83,13 @@ + + files { "../src/physfs/*.c", "../src/zlib/*.c", "../src/physfs/archivers/*.c", } + +- configuration "linux" ++ filter "system:linux" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "bsd" ++ filter "system:bsd" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "windows" ++ filter "system:windows" + files { "../src/physfs/platform/windows.c", } +- configuration "macosx" ++ filter "system:macosx" + files { "../src/physfs/platform/macosx.c", "../src/physfs/platform/posix.c", } + includedirs { "/Library/Frameworks/SDL.framework/Headers" } + +diff -Naur orig/build/te4core.lua new/build/te4core.lua +--- orig/build/te4core.lua 2019-10-03 15:35:43.000000000 +0200 ++++ new/build/te4core.lua 2020-10-30 23:05:15.066698600 +0100 +@@ -40,11 +40,11 @@ + links { "physfs", "lua".._OPTIONS.lua, "fov", "luasocket", "luaprofiler", "lpeg", "tcodimport", "lxp", "expatstatic", "luamd5", "luazlib", "luabitop", "te4-bzip", "te4-wfc", "utf8proc" } + if _OPTIONS.discord then defines { "DISCORD_TE4" } end + defines { "_DEFAULT_VIDEOMODE_FLAGS_='SDL_HWSURFACE|SDL_DOUBLEBUF'" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], "TE4CORE_VERSION="..TE4CORE_VERSION } ++ 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 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 +@@ -63,7 +63,7 @@ + prelinkcommands { "i686-pc-mingw32-ranlib ../bin/Debug/*.a" } + end + +- configuration "macosx" ++ filter "system:macosx" + files { "../src/mac/SDL*" } + includedirs { + "/System/Library/Frameworks/OpenGL.framework/Headers", +@@ -84,7 +84,7 @@ + "/usr/local/include", + "/usr/local/opt/libpng12/include", + } +- defines { "USE_TENGINE_MAIN", 'SELFEXE_MACOSX', [[TENGINE_HOME_PATH='"/Library/Application Support/T-Engine/"']] } ++ defines { "USE_TENGINE_MAIN", 'SELFEXE_MACOSX', [[TENGINE_HOME_PATH="/Library/Application Support/T-Engine/"]] } + linkoptions { + "-framework Cocoa", + "-framework OpenGL", +@@ -108,9 +108,9 @@ + targetdir "." + links { "IOKit" } + +- configuration "windows" ++ filter "system:windows" + links { "mingw32", "SDL2main", "SDL2", "SDL2_ttf", "SDL2_image", "OpenAL32", "vorbisfile", "opengl32", "glu32", "wsock32", "png" } +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } + if _OPTIONS.wincross then + prebuildcommands { "i686-pc-mingw32-windres ../src/windows/icon.rc -O coff -o ../src/windows/icon.res" } + else +@@ -118,33 +118,33 @@ + end + linkoptions { "../src/windows/icon.res" } + linkoptions { "-mwindows" } +- defines { [[TENGINE_HOME_PATH='"T-Engine"']], 'SELFEXE_WINDOWS' } ++ defines { [[TENGINE_HOME_PATH="T-Engine"]], 'SELFEXE_WINDOWS' } + +- configuration "linux" ++ filter "system:linux" + libdirs {"/opt/SDL-2.0/lib/"} + links { "dl", "SDL2", "SDL2_ttf", "SDL2_image", "png", "openal", "vorbisfile", "GL", "GLU", "m", "pthread" } + linkoptions { "-Wl,-E" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_LINUX' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_LINUX' } + if steamlin64 then steamlin64() end + +- configuration "bsd" ++ filter "system:bsd" + libdirs {"/usr/local/lib/"} + links { "SDL2", "SDL2_ttf", "SDL2_image", "png", "openal", "vorbisfile", "GL", "GLU", "m", "pthread" } +- defines { [[TENGINE_HOME_PATH='".t-engine"']], 'SELFEXE_BSD' } ++ defines { [[TENGINE_HOME_PATH=".t-engine"]], 'SELFEXE_BSD' } + +- configuration {"Debug"} ++ filter {"Debug"} + if _OPTIONS.wincross then + postbuildcommands { "cp ../bin/Debug/t-engine.exe ../", } + else +- if os.get() ~= "macosx" then postbuildcommands { "cp ../bin/Debug/t-engine ../", } ++ if os.target() ~= "macosx" then postbuildcommands { "cp ../bin/Debug/t-engine ../", } + else postbuildcommands { "cp ../build/t-engine.app/Contents/MacOS/t-engine ../mac/base_app/Contents/MacOS", } + end + end +- configuration {"Release"} ++ filter {"Release"} + if _OPTIONS.wincross then + postbuildcommands { "cp ../bin/Release/t-engine.exe ../", } + else +- if os.get() ~= "macosx" then postbuildcommands { "cp ../bin/Release/t-engine ../", } ++ if os.target() ~= "macosx" then postbuildcommands { "cp ../bin/Release/t-engine ../", } + else postbuildcommands { "cp ../build/t-engine.app/Contents/MacOS/t-engine ../mac/base_app/Contents/MacOS", } + end + end +@@ -165,13 +165,13 @@ + + files { "../src/physfs/*.c", "../src/zlib/*.c", "../src/physfs/archivers/*.c", } + +- configuration "linux" ++ filter "system:linux" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "bsd" ++ filter "system:bsd" + files { "../src/physfs/platform/unix.c", "../src/physfs/platform/posix.c", } +- configuration "windows" ++ filter "system:windows" + files { "../src/physfs/platform/windows.c", } +- configuration "macosx" ++ filter "system:macosx" + files { "../src/physfs/platform/macosx.c", "../src/physfs/platform/posix.c", } + includedirs { "/Library/Frameworks/SDL2.framework/Headers" } + +@@ -230,7 +230,7 @@ + defines { "LJ_ABI_SOFTFP=0" } + end + +- configuration {"Debug"} ++ filter {"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"', +@@ -238,7 +238,7 @@ + } + end + postbuildcommands { "cp ../bin/Debug/minilua ../src/luajit2/src/host/", } +- configuration {"Release"} ++ filter {"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"', +@@ -332,7 +332,7 @@ + + files { "../src/luajit2/src/host/buildvm*.c" } + +- configuration {"Debug"} ++ filter {"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"', +@@ -344,7 +344,7 @@ + } + end + postbuildcommands { "cp ../bin/Debug/buildvm ../src/luajit2/src/", } +- configuration {"Release"} ++ filter {"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"', +@@ -367,7 +367,7 @@ + files { "../src/luajit2/src/*.c", "../src/luajit2/src/*.s", "../src/luajit2/src/lj_vm.s", "../src/luajit2/src/lj_bcdef.h", "../src/luajit2/src/lj_ffdef.h", "../src/luajit2/src/lj_ffdef.h", "../src/luajit2/src/lj_libdef.h", "../src/luajit2/src/lj_recdef.h", "../src/luajit2/src/lj_folddef.h" } + excludes { "../src/luajit2/src/buildvm*.c", "../src/luajit2/src/luajit.c", "../src/luajit2/src/ljamalg.c" } + +- configuration "linux" ++ filter "system:linux" + if not _OPTIONS["no-cleanup-jit2"] then + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ +@@ -381,7 +381,7 @@ + } + end + +- configuration "bsd" ++ filter "system:bsd" + if not _OPTIONS["no-cleanup-jit2"] then + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ +@@ -395,7 +395,7 @@ + } + end + +- configuration "macosx" ++ filter "system:macosx" + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ + "../src/luajit2/src/buildvm -m machasm -o ../src/luajit2/src/lj_vm.s", +@@ -407,7 +407,7 @@ + "../src/luajit2/src/buildvm -m folddef -o ../src/luajit2/src/lj_folddef.h ../src/luajit2/src/lj_opt_fold.c", + } + +- configuration "windows" ++ filter "system:windows" + if not _OPTIONS["no-cleanup-jit2"] then + local list = "../src/luajit2/src/lib_base.c ../src/luajit2/src/lib_math.c ../src/luajit2/src/lib_bit.c ../src/luajit2/src/lib_string.c ../src/luajit2/src/lib_table.c ../src/luajit2/src/lib_io.c ../src/luajit2/src/lib_os.c ../src/luajit2/src/lib_package.c ../src/luajit2/src/lib_debug.c ../src/luajit2/src/lib_jit.c ../src/luajit2/src/lib_ffi.c" + prebuildcommands{ +@@ -429,7 +429,7 @@ + targetname "luasocket" + buildoptions { "-O2" } + +- configuration "not windows" ++ filter "system:not windows" + files { + "../src/luasocket/auxiliar.c", + "../src/luasocket/buffer.c", +@@ -445,7 +445,7 @@ + "../src/luasocket/usocket.c", + "../src/luasocket/mime.c", + } +- configuration "windows" ++ filter "system:windows" + files { + "../src/luasocket/auxiliar.c", + "../src/luasocket/buffer.c", +@@ -583,21 +583,21 @@ + buildoptions { "-O3", "-std=c++11" } + cppconfig("web") + +- if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN "} end +- if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\\$\$ORIGIN "} end ++ if _OPTIONS.relpath=="32" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN "} end ++ if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN "} end + + files { "../src/web-cef3/*.cpp", } + +- configuration "macosx" ++ filter "system:macosx" + defines { 'SELFEXE_MACOSX' } + libdirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/xcodebuild/Release/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/Release/"} + includedirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/include/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/"} + links { "cef", "cef_dll_wrapper" } + +- configuration "windows" ++ filter "system:windows" + defines { 'SELFEXE_WINDOWS' } + +- configuration "linux" ++ filter "system:linux" + 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/"} +@@ -619,19 +619,19 @@ + "../src/web-cef3/spawn.cpp", + } + +- configuration "macosx" ++ filter "system:macosx" + defines { 'SELFEXE_MACOSX' } + libdirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/xcodebuild/Release/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/Release/"} + includedirs {"/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/include/", "/Users/darkmac/libs/CEF/cef_binary_3.1547.1597_macosx64/"} + links { "cef", "cef_dll_wrapper" } + +- configuration "linux" ++ filter "system:linux" + 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" } +- 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 linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib "} end ++ if _OPTIONS.relpath=="64" then linkoptions{"-Wl,-rpath -Wl,\\$$ORIGIN/lib64 "} end + defines { 'SELFEXE_LINUX' } + end + +@@ -641,7 +641,7 @@ + + if _OPTIONS.discord and not _OPTIONS['discord-nolib'] then + project "te4-discord" +- configuration "linux" ++ filter "system:linux" + kind "SharedLib" + language "C++" + targetname "discord-rpc" +@@ -654,11 +654,11 @@ + files { "../src/discord-rpc/src/discord-rpc.cpp", "../src/discord-rpc/src/rpc_connection.cpp", "../src/discord-rpc/src/serialization.cpp", } + files { "../src/discord-rpc/src/connection_unix.cpp", "../src/discord-rpc/src/discord_register_linux.cpp", } + +- configuration "windows" ++ filter "system:windows" + kind "SharedLib" + -- Empty + +- configuration "macosx" ++ filter "system:macosx" + kind "SharedLib" + -- Empty + end +diff -Naur orig/premake5.lua new/premake5.lua +--- orig/premake5.lua 2019-09-13 11:46:14.000000000 +0200 ++++ new/premake5.lua 2020-10-30 23:04:41.500196031 +0100 +@@ -1,6 +1,6 @@ + dofile("build/options.lua") + +-solution "TEngine" ++workspace "TEngine" + configurations { "Debug", "Release" } + objdir "obj" + defines {"GLEW_STATIC"} @@ -30,7 +30,7 @@ } else @@ -10,3 +382,76 @@ diff -Naur orig/premake4.lua new/premake4.lua "/usr/include/GL", } end +@@ -42,7 +42,7 @@ + dofile("steamworks/build/steam-def.lua") + end + +-configuration "bsd" ++filter "system:bsd" + libdirs { + "/usr/local/lib", + } +@@ -51,7 +51,7 @@ + } + + if _OPTIONS.wincross then +-configuration "windows" ++filter "system:windows" + libdirs { + "/Test/xcompile/local//lib", + } +@@ -60,7 +60,7 @@ + "/Test/xcompile/local/include", + } + else +-configuration "windows" ++filter "system:windows" + libdirs { + "/c/code/SDL/lib", + } +@@ -72,7 +72,7 @@ + end + + cppconfig = function(what) +- if os.get() == "macosx" then ++ if os.target() == "macosx" then + if what == "web" then + buildoptions { "-stdlib=libstdc++" } + linkoptions { "-stdlib=libstdc++" } +@@ -84,9 +84,8 @@ + -- links { "stdc++" } + end + +-configuration "macosx" +- premake.gcc.cc = 'clang' +- premake.gcc.cxx = 'clang++' ++filter "system:macosx" ++ toolset("clang") + + buildoptions { "-isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk", "-mmacosx-version-min=10.7" } + includedirs { +@@ -95,9 +94,9 @@ + "/Library/Frameworks/SDL2_ttf.framework/Headers", + } + +-configuration "Debug" ++filter "Debug" + defines { } +- flags { "Symbols" } ++ symbols "On" + buildoptions { "-ggdb" } + -- buildoptions { "-O3" } + targetdir "bin/Debug" +@@ -105,9 +104,10 @@ + if _OPTIONS.pedantic then buildoptions { "-Wall" } end + defines {"TE4_LUA_ALLOW_GENERIC_IO"} + +-configuration "Release" ++filter "Release" + defines { "NDEBUG=1" } +- flags { "Optimize", "NoFramePointer" } ++ optimize "On" ++ omitframepointer "On" + buildoptions { "-O2" } + targetdir "bin/Release" + |