fixed line formatting

This commit is contained in:
Blingu 2020-08-08 13:07:55 +02:00
parent 2af22cfabc
commit c50160a992

View File

@ -1,308 +1,329 @@
newoption { newoption {
trigger = "glewdir", trigger = "glewdir",
value = "PATH", value = "PATH",
description = "Directory of GLEW", description = "Directory of GLEW",
default = "glew-2.1.0" default = "glew-2.1.0"
} }
newoption { newoption {
trigger = "glfwdir64", trigger = "glfwdir64",
value = "PATH", value = "PATH",
description = "Directory of glfw", description = "Directory of glfw",
default = "glfw-3.3.2.bin.WIN64", default = "glfw-3.3.2.bin.WIN64",
} }
newoption { newoption {
trigger = "glfwdir32", trigger = "glfwdir32",
value = "PATH", value = "PATH",
description = "Directory of glfw", description = "Directory of glfw",
default = "glfw-3.3.2.bin.WIN32", default = "glfw-3.3.2.bin.WIN32",
} }
newoption { newoption {
trigger = "with-librw", trigger = "with-librw",
description = "Build and use librw from this solution" description = "Build and use librw from this solution"
} }
newoption { newoption {
trigger = "with-opus", trigger = "with-opus",
description = "Build with opus" description = "Build with opus"
} }
if(_OPTIONS["with-librw"]) then if(_OPTIONS["with-librw"]) then
Librw = "librw" Librw = "librw"
else else
Librw = os.getenv("LIBRW") or "librw" Librw = os.getenv("LIBRW") or "librw"
end end
function getsys(a) function getsys(a)
if a == 'windows' then if a == 'windows' then
return 'win' return 'win'
end end
return a return a
end end
function getarch(a) function getarch(a)
if a == 'x86_64' then if a == 'x86_64' then
return 'amd64' return 'amd64'
elseif a == 'ARM' then elseif a == 'ARM' then
return 'arm' return 'arm'
end end
return a return a
end end
workspace "re3" workspace "re3"
language "C++" language "C++"
configurations { "Debug", "Release" } configurations { "Debug", "Release" }
location "build" location "build"
symbols "Full" symbols "Full"
staticruntime "off" staticruntime "off"
filter { "system:windows" } filter { "system:windows" }
platforms { platforms {
"win-x86-RW33_d3d8-mss", "win-x86-RW33_d3d8-mss",
"win-x86-librw_d3d9-mss", "win-x86-librw_d3d9-mss",
"win-x86-librw_gl3_glfw-mss", "win-x86-librw_gl3_glfw-mss",
"win-x86-RW33_d3d8-oal", "win-x86-RW33_d3d8-oal",
"win-x86-librw_d3d9-oal", "win-x86-librw_d3d9-oal",
"win-x86-librw_gl3_glfw-oal", "win-x86-librw_gl3_glfw-oal",
"win-amd64-librw_d3d9-oal", "win-amd64-librw_d3d9-oal",
"win-amd64-librw_gl3_glfw-oal", "win-amd64-librw_gl3_glfw-oal",
} }
filter { "system:linux" } filter { "system:linux" }
platforms { platforms {
"linux-x86-librw_gl3_glfw-oal", "linux-x86-librw_gl3_glfw-oal",
"linux-amd64-librw_gl3_glfw-oal", "linux-amd64-librw_gl3_glfw-oal",
"linux-arm-librw_gl3_glfw-oal", "linux-arm-librw_gl3_glfw-oal",
} }
filter "configurations:Debug" filter { "system:bsd" }
defines { "DEBUG" } platforms {
"bsd-amd64-librw_gl3_glfw-oal"
filter "configurations:Release" }
defines { "NDEBUG" }
optimize "On" filter "configurations:Debug"
defines { "DEBUG" }
filter { "platforms:win*" }
system "windows" filter "configurations:Release"
defines { "NDEBUG" }
filter { "platforms:linux*" } optimize "On"
system "linux"
filter { "platforms:win*" }
filter { "platforms:*x86*" } system "windows"
architecture "x86"
filter { "platforms:linux*" }
filter { "platforms:*amd64*" } system "linux"
architecture "amd64"
filter { "platforms:bsd*" }
filter { "platforms:*arm*" } system "bsd"
architecture "ARM"
filter { "platforms:*x86*" }
filter { "platforms:*librw_d3d9*" } architecture "x86"
defines { "RW_D3D9" }
if(not _OPTIONS["with-librw"]) then filter { "platforms:*amd64*" }
libdirs { path.join(Librw, "lib/win-%{getarch(cfg.architecture)}-d3d9/%{cfg.buildcfg}") } architecture "amd64"
end
filter { "platforms:*arm*" }
filter "platforms:*librw_gl3_glfw*" architecture "ARM"
defines { "RW_GL3" }
includedirs { path.join(_OPTIONS["glewdir"], "include") } filter { "platforms:*librw_d3d9*" }
if(not _OPTIONS["with-librw"]) then defines { "RW_D3D9" }
libdirs { path.join(Librw, "lib/%{getsys(cfg.system)}-%{getarch(cfg.architecture)}-gl3/%{cfg.buildcfg}") } if(not _OPTIONS["with-librw"]) then
end libdirs { path.join(Librw, "lib/win-%{getarch(cfg.architecture)}-d3d9/%{cfg.buildcfg}") }
end
filter "platforms:*x86-librw_gl3_glfw*"
includedirs { path.join(_OPTIONS["glfwdir32"], "include") } filter "platforms:*librw_gl3_glfw*"
defines { "RW_GL3" }
filter "platforms:*amd64-librw_gl3_glfw*" includedirs { path.join(_OPTIONS["glewdir"], "include") }
includedirs { path.join(_OPTIONS["glfwdir64"], "include") } if(not _OPTIONS["with-librw"]) then
libdirs { path.join(Librw, "lib/%{getsys(cfg.system)}-%{getarch(cfg.architecture)}-gl3/%{cfg.buildcfg}") }
filter "platforms:win*librw_gl3_glfw*" end
defines { "GLEW_STATIC" }
filter "platforms:*x86-librw_gl3_glfw*"
filter {} includedirs { path.join(_OPTIONS["glfwdir32"], "include") }
function setpaths (gamepath, exepath, scriptspath) filter "platforms:*amd64-librw_gl3_glfw*"
scriptspath = scriptspath or "" includedirs { path.join(_OPTIONS["glfwdir64"], "include") }
if (gamepath) then
postbuildcommands { filter "platforms:win*librw_gl3_glfw*"
'{COPY} "%{cfg.buildtarget.abspath}" "' .. gamepath .. scriptspath .. '%{cfg.buildtarget.name}"' defines { "GLEW_STATIC" }
}
debugdir (gamepath) filter {}
if (exepath) then
-- Used VS variable $(TargetFileName) because it doesn't accept premake tokens. Does debugcommand even work outside VS?? function setpaths (gamepath, exepath, scriptspath)
debugcommand (gamepath .. "$(TargetFileName)") scriptspath = scriptspath or ""
dir, file = exepath:match'(.*/)(.*)' if (gamepath) then
debugdir (gamepath .. (dir or "")) postbuildcommands {
end '{COPY} "%{cfg.buildtarget.abspath}" "' .. gamepath .. scriptspath .. '%{cfg.buildtarget.name}"'
end }
--targetdir ("bin/%{prj.name}/" .. scriptspath) debugdir (gamepath)
end if (exepath) then
-- Used VS variable $(TargetFileName) because it doesn't accept premake tokens. Does debugcommand even work outside VS??
if(_OPTIONS["with-librw"]) then debugcommand (gamepath .. "$(TargetFileName)")
project "librw" dir, file = exepath:match'(.*/)(.*)'
kind "StaticLib" debugdir (gamepath .. (dir or ""))
targetname "rw" end
targetdir "lib/%{cfg.platform}/%{cfg.buildcfg}" end
files { path.join(Librw, "src/*.*") } --targetdir ("bin/%{prj.name}/" .. scriptspath)
files { path.join(Librw, "src/*/*.*") } end
filter "platforms:*RW33*"
flags { "ExcludeFromBuild" } if(_OPTIONS["with-librw"]) then
filter {} project "librw"
end kind "StaticLib"
targetname "rw"
local function addSrcFiles( prefix ) targetdir "lib/%{cfg.platform}/%{cfg.buildcfg}"
return prefix .. "/*cpp", prefix .. "/*.h", prefix .. "/*.c", prefix .. "/*.ico", prefix .. "/*.rc" files { path.join(Librw, "src/*.*") }
end files { path.join(Librw, "src/*/*.*") }
project "re3" filter "platforms:bsd*"
kind "WindowedApp" includedirs { "/usr/local/include" }
targetname "re3" libdirs { "/usr/local/lib" }
targetdir "bin/%{cfg.platform}/%{cfg.buildcfg}"
filter "platforms:*RW33*"
files { addSrcFiles("src") } flags { "ExcludeFromBuild" }
files { addSrcFiles("src/animation") } filter {}
end
local function addSrcFiles( prefix )
return prefix .. "/*cpp", prefix .. "/*.h", prefix .. "/*.c", prefix .. "/*.ico", prefix .. "/*.rc"
end
project "re3"
kind "WindowedApp"
targetname "re3"
targetdir "bin/%{cfg.platform}/%{cfg.buildcfg}"
files { addSrcFiles("src") }
files { addSrcFiles("src/animation") }
files { addSrcFiles("src/audio") } files { addSrcFiles("src/audio") }
files { addSrcFiles("src/audio/eax") } files { addSrcFiles("src/audio/eax") }
files { addSrcFiles("src/audio/oal") } files { addSrcFiles("src/audio/oal") }
files { addSrcFiles("src/control") } files { addSrcFiles("src/control") }
files { addSrcFiles("src/core") } files { addSrcFiles("src/core") }
files { addSrcFiles("src/entities") } files { addSrcFiles("src/entities") }
files { addSrcFiles("src/math") } files { addSrcFiles("src/math") }
files { addSrcFiles("src/modelinfo") } files { addSrcFiles("src/modelinfo") }
files { addSrcFiles("src/objects") } files { addSrcFiles("src/objects") }
files { addSrcFiles("src/peds") } files { addSrcFiles("src/peds") }
files { addSrcFiles("src/render") } files { addSrcFiles("src/render") }
files { addSrcFiles("src/rw") } files { addSrcFiles("src/rw") }
files { addSrcFiles("src/save") } files { addSrcFiles("src/save") }
files { addSrcFiles("src/skel") } files { addSrcFiles("src/skel") }
files { addSrcFiles("src/skel/glfw") } files { addSrcFiles("src/skel/glfw") }
files { addSrcFiles("src/text") } files { addSrcFiles("src/text") }
files { addSrcFiles("src/vehicles") } files { addSrcFiles("src/vehicles") }
files { addSrcFiles("src/weapons") } files { addSrcFiles("src/weapons") }
files { addSrcFiles("src/extras") } files { addSrcFiles("src/extras") }
includedirs { "src" } includedirs { "src" }
includedirs { "src/animation" } includedirs { "src/animation" }
includedirs { "src/audio" } includedirs { "src/audio" }
includedirs { "src/audio/eax" } includedirs { "src/audio/eax" }
includedirs { "src/audio/oal" } includedirs { "src/audio/oal" }
includedirs { "src/control" } includedirs { "src/control" }
includedirs { "src/core" } includedirs { "src/core" }
includedirs { "src/entities" } includedirs { "src/entities" }
includedirs { "src/math" } includedirs { "src/math" }
includedirs { "src/modelinfo" } includedirs { "src/modelinfo" }
includedirs { "src/objects" } includedirs { "src/objects" }
includedirs { "src/peds" } includedirs { "src/peds" }
includedirs { "src/render" } includedirs { "src/render" }
includedirs { "src/rw" } includedirs { "src/rw" }
includedirs { "src/save/" } includedirs { "src/save/" }
includedirs { "src/skel/" } includedirs { "src/skel/" }
includedirs { "src/skel/glfw" } includedirs { "src/skel/glfw" }
includedirs { "src/text" } includedirs { "src/text" }
includedirs { "src/vehicles" } includedirs { "src/vehicles" }
includedirs { "src/weapons" } includedirs { "src/weapons" }
includedirs { "src/extras" } includedirs { "src/extras" }
if _OPTIONS["with-opus"] then if _OPTIONS["with-opus"] then
includedirs { "ogg/include" } includedirs { "ogg/include" }
includedirs { "opus/include" } includedirs { "opus/include" }
includedirs { "opusfile/include" } includedirs { "opusfile/include" }
end end
filter "platforms:*mss" filter "platforms:*mss"
defines { "AUDIO_MSS" } defines { "AUDIO_MSS" }
includedirs { "sdk/milessdk/include" } includedirs { "sdk/milessdk/include" }
libdirs { "sdk/milessdk/lib" } libdirs { "sdk/milessdk/lib" }
if _OPTIONS["with-opus"] then if _OPTIONS["with-opus"] then
filter "platforms:win*" filter "platforms:win*"
libdirs { "ogg/win32/VS2015/Win32/%{cfg.buildcfg}" } libdirs { "ogg/win32/VS2015/Win32/%{cfg.buildcfg}" }
libdirs { "opus/win32/VS2015/Win32/%{cfg.buildcfg}" } libdirs { "opus/win32/VS2015/Win32/%{cfg.buildcfg}" }
libdirs { "opusfile/win32/VS2015/Win32/Release-NoHTTP" } libdirs { "opusfile/win32/VS2015/Win32/Release-NoHTTP" }
filter {} filter {}
defines { "AUDIO_OPUS" } defines { "AUDIO_OPUS" }
end end
filter "platforms:*oal" filter "platforms:*oal"
defines { "AUDIO_OAL" } defines { "AUDIO_OAL" }
filter {} filter {}
if(os.getenv("GTA_III_RE_DIR")) then if(os.getenv("GTA_III_RE_DIR")) then
setpaths("$(GTA_III_RE_DIR)/", "%(cfg.buildtarget.name)", "") setpaths("$(GTA_III_RE_DIR)/", "%(cfg.buildtarget.name)", "")
end end
filter "platforms:win*" filter "platforms:win*"
files { addSrcFiles("src/skel/win") } files { addSrcFiles("src/skel/win") }
includedirs { "src/skel/win" } includedirs { "src/skel/win" }
linkoptions "/SAFESEH:NO" linkoptions "/SAFESEH:NO"
characterset ("MBCS") characterset ("MBCS")
targetextension ".exe" targetextension ".exe"
filter "platforms:win-x86*oal" filter "platforms:win-x86*oal"
includedirs { "openal-soft/include" } includedirs { "openal-soft/include" }
includedirs { "libsndfile.32/include" } includedirs { "libsndfile.32/include" }
includedirs { "mpg123.32/include" } includedirs { "mpg123.32/include" }
libdirs { "mpg123.32/lib" } libdirs { "mpg123.32/lib" }
libdirs { "libsndfile.32/lib" } libdirs { "libsndfile.32/lib" }
libdirs { "openal-soft/libs/Win32" } libdirs { "openal-soft/libs/Win32" }
filter "platforms:win-amd64*oal" filter "platforms:win-amd64*oal"
includedirs { "openal-soft/include" } includedirs { "openal-soft/include" }
includedirs { "libsndfile.64/include" } includedirs { "libsndfile.64/include" }
includedirs { "mpg123.64/include" } includedirs { "mpg123.64/include" }
libdirs { "mpg123.64/lib" } libdirs { "mpg123.64/lib" }
libdirs { "libsndfile.64/lib" } libdirs { "libsndfile.64/lib" }
libdirs { "openal-soft/libs/Win64" } libdirs { "openal-soft/libs/Win64" }
filter "platforms:linux*oal" filter "platforms:linux*oal"
links { "openal", "mpg123", "sndfile", "pthread" } links { "openal", "mpg123", "sndfile", "pthread" }
if _OPTIONS["with-opus"] then filter "platforms:bsd*oal"
filter {} links { "openal", "mpg123", "sndfile", "pthread" }
links { "libogg" }
links { "opus" } if _OPTIONS["with-opus"] then
links { "opusfile" } filter {}
end links { "libogg" }
links { "opus" }
filter "platforms:*RW33*" links { "opusfile" }
staticruntime "on" end
includedirs { "sdk/rwsdk/include/d3d8" }
libdirs { "sdk/rwsdk/lib/d3d8/release" } filter "platforms:*RW33*"
links { "rwcore", "rpworld", "rpmatfx", "rpskin", "rphanim", "rtbmp", "rtquat", "rtcharse" } staticruntime "on"
defines { "RWLIBS" } includedirs { "sdk/rwsdk/include/d3d8" }
linkoptions "/SECTION:_rwcseg,ER!W /MERGE:_rwcseg=.text" libdirs { "sdk/rwsdk/lib/d3d8/release" }
links { "rwcore", "rpworld", "rpmatfx", "rpskin", "rphanim", "rtbmp", "rtquat", "rtcharse" }
filter "platforms:*librw*" defines { "RWLIBS" }
defines { "LIBRW" } linkoptions "/SECTION:_rwcseg,ER!W /MERGE:_rwcseg=.text"
files { addSrcFiles("src/fakerw") }
includedirs { "src/fakerw" } filter "platforms:*librw*"
includedirs { Librw } defines { "LIBRW" }
if(_OPTIONS["with-librw"]) then files { addSrcFiles("src/fakerw") }
libdirs { "lib/%{cfg.platform}/%{cfg.buildcfg}" } includedirs { "src/fakerw" }
end includedirs { Librw }
links { "rw" } if(_OPTIONS["with-librw"]) then
libdirs { "lib/%{cfg.platform}/%{cfg.buildcfg}" }
filter "platforms:*d3d9*" end
links { "d3d9" } links { "rw" }
filter "platforms:*x86*d3d*" filter "platforms:*d3d9*"
includedirs { "sdk/dx8sdk/include" } links { "d3d9" }
libdirs { "sdk/dx8sdk/lib" }
filter "platforms:*x86*d3d*"
filter "platforms:*amd64*d3d9*" includedirs { "sdk/dx8sdk/include" }
defines { "USE_D3D9" } libdirs { "sdk/dx8sdk/lib" }
filter "platforms:win-x86*gl3_glfw*" filter "platforms:*amd64*d3d9*"
libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/Win32") } defines { "USE_D3D9" }
libdirs { path.join(_OPTIONS["glfwdir32"], "lib-" .. string.gsub(_ACTION or '', "vs", "vc")) }
links { "opengl32", "glew32s", "glfw3" } filter "platforms:win-x86*gl3_glfw*"
libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/Win32") }
filter "platforms:win-amd64*gl3_glfw*" libdirs { path.join(_OPTIONS["glfwdir32"], "lib-" .. string.gsub(_ACTION or '', "vs", "vc")) }
libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/x64") } links { "opengl32", "glew32s", "glfw3" }
libdirs { path.join(_OPTIONS["glfwdir64"], "lib-" .. string.gsub(_ACTION or '', "vs", "vc")) }
links { "opengl32", "glew32s", "glfw3" } filter "platforms:win-amd64*gl3_glfw*"
libdirs { path.join(_OPTIONS["glewdir"], "lib/Release/x64") }
filter "platforms:linux*gl3_glfw*" libdirs { path.join(_OPTIONS["glfwdir64"], "lib-" .. string.gsub(_ACTION or '', "vs", "vc")) }
links { "GL", "GLEW", "glfw" } links { "opengl32", "glew32s", "glfw3" }
filter "platforms:linux*gl3_glfw*"
links { "GL", "GLEW", "glfw" }
filter "platforms:bsd*gl3_glfw*"
links { "GL", "GLEW", "glfw", "sysinfo" }
includedirs { "/usr/local/include" }
libdirs { "/usr/local/lib" }