diff --git a/.travis.yml b/.travis.yml index 7536f47a3..188278034 100644 --- a/.travis.yml +++ b/.travis.yml @@ -28,9 +28,9 @@ addons: jobs: include: - - env: C_COMPILER=clang-9 CXX_COMPILER=clang++-9 LINT=true - - env: C_COMPILER=clang-9 CXX_COMPILER=clang++-9 BUILD=true CONFIG=Debug - - env: C_COMPILER=clang-9 CXX_COMPILER=clang++-9 BUILD=true CONFIG=Release + - env: C_COMPILER=clang-9 CXX_COMPILER=clang++-9 AR_COMPILER=llvm-ar-9 LINT=true + - env: C_COMPILER=clang-9 CXX_COMPILER=clang++-9 AR_COMPILER=llvm-ar-9 BUILD=true CONFIG=Debug + - env: C_COMPILER=clang-9 CXX_COMPILER=clang++-9 AR_COMPILER=llvm-ar-9 BUILD=true CONFIG=Release git: # We handle submodules ourselves in xenia-build setup. @@ -40,8 +40,10 @@ before_script: - export LIBVULKAN_VERSION=1.1.70 - export CXX=$CXX_COMPILER - export CC=$C_COMPILER + - export AR=$AR_COMPILER # Dump useful info. - $CXX --version + - $AR_COMPILER --version - python3 --version - clang-format-9 --version - clang-format-9 -style=file -dump-config diff --git a/premake5.lua b/premake5.lua index 2137515ba..fac718955 100644 --- a/premake5.lua +++ b/premake5.lua @@ -91,7 +91,6 @@ filter("platforms:Linux") buildoptions({ -- "-mlzcnt", -- (don't) Assume lzcnt is supported. ({os.outputof("pkg-config --cflags gtk+-x11-3.0")})[1], - "-fno-lto", -- Premake doesn't support LTO on clang }) links({ "stdc++fs", diff --git a/src/xenia/app/premake5.lua b/src/xenia/app/premake5.lua index ac3f48eb4..8d836ff43 100644 --- a/src/xenia/app/premake5.lua +++ b/src/xenia/app/premake5.lua @@ -8,19 +8,6 @@ project("xenia-app") targetname("xenia") language("C++") links({ - "aes_128", - "capstone", - "fmt", - "dxbc", - "discord-rpc", - "glslang-spirv", - "imgui", - "libavcodec", - "libavutil", - "mspack", - "snappy", - "spirv-tools", - "volk", "xenia-app-discord", "xenia-apu", "xenia-apu-nop", @@ -42,6 +29,21 @@ project("xenia-app") "xenia-ui-spirv", "xenia-ui-vulkan", "xenia-vfs", + }) + links({ + "aes_128", + "capstone", + "fmt", + "dxbc", + "discord-rpc", + "glslang-spirv", + "imgui", + "libavcodec", + "libavutil", + "mspack", + "snappy", + "spirv-tools", + "volk", "xxhash", }) defines({ diff --git a/src/xenia/gpu/d3d12/premake5.lua b/src/xenia/gpu/d3d12/premake5.lua index 812e3cc85..afb18abaf 100644 --- a/src/xenia/gpu/d3d12/premake5.lua +++ b/src/xenia/gpu/d3d12/premake5.lua @@ -25,15 +25,6 @@ project("xenia-gpu-d3d12-trace-viewer") kind("WindowedApp") language("C++") links({ - "aes_128", - "capstone", - "dxbc", - "fmt", - "imgui", - "libavcodec", - "libavutil", - "mspack", - "snappy", "xenia-apu", "xenia-apu-nop", "xenia-base", @@ -48,6 +39,17 @@ project("xenia-gpu-d3d12-trace-viewer") "xenia-ui", "xenia-ui-d3d12", "xenia-vfs", + }) + links({ + "aes_128", + "capstone", + "dxbc", + "fmt", + "imgui", + "libavcodec", + "libavutil", + "mspack", + "snappy", "xxhash", }) files({ @@ -70,15 +72,6 @@ project("xenia-gpu-d3d12-trace-dump") kind("ConsoleApp") language("C++") links({ - "aes_128", - "capstone", - "dxbc", - "fmt", - "imgui", - "libavcodec", - "libavutil", - "mspack", - "snappy", "xenia-apu", "xenia-apu-nop", "xenia-base", @@ -93,6 +86,17 @@ project("xenia-gpu-d3d12-trace-dump") "xenia-ui", "xenia-ui-d3d12", "xenia-vfs", + }) + links({ + "aes_128", + "capstone", + "dxbc", + "fmt", + "imgui", + "libavcodec", + "libavutil", + "mspack", + "snappy", "xxhash", }) files({ @@ -107,4 +111,4 @@ project("xenia-gpu-d3d12-trace-dump") "2>&1", "1>scratch/stdout-trace-dump.txt", }) - end \ No newline at end of file + end diff --git a/src/xenia/gpu/vulkan/premake5.lua b/src/xenia/gpu/vulkan/premake5.lua index fada8e143..c1437995f 100644 --- a/src/xenia/gpu/vulkan/premake5.lua +++ b/src/xenia/gpu/vulkan/premake5.lua @@ -30,17 +30,6 @@ project("xenia-gpu-vulkan-trace-viewer") kind("WindowedApp") language("C++") links({ - "aes_128", - "capstone", - "fmt", - "glslang-spirv", - "imgui", - "libavcodec", - "libavutil", - "mspack", - "snappy", - "spirv-tools", - "volk", "xenia-apu", "xenia-apu-nop", "xenia-base", @@ -56,6 +45,19 @@ project("xenia-gpu-vulkan-trace-viewer") "xenia-ui-spirv", "xenia-ui-vulkan", "xenia-vfs", + }) + links({ + "aes_128", + "capstone", + "fmt", + "glslang-spirv", + "imgui", + "libavcodec", + "libavutil", + "mspack", + "snappy", + "spirv-tools", + "volk", "xxhash", }) defines({ @@ -97,17 +99,6 @@ project("xenia-gpu-vulkan-trace-dump") kind("ConsoleApp") language("C++") links({ - "aes_128", - "capstone", - "fmt", - "glslang-spirv", - "imgui", - "libavcodec", - "libavutil", - "mspack", - "snappy", - "spirv-tools", - "volk", "xenia-apu", "xenia-apu-nop", "xenia-base", @@ -123,6 +114,19 @@ project("xenia-gpu-vulkan-trace-dump") "xenia-ui-spirv", "xenia-ui-vulkan", "xenia-vfs", + }) + links({ + "aes_128", + "capstone", + "fmt", + "glslang-spirv", + "imgui", + "libavcodec", + "libavutil", + "mspack", + "snappy", + "spirv-tools", + "volk", "xxhash", }) defines({ diff --git a/src/xenia/hid/premake5.lua b/src/xenia/hid/premake5.lua index 152887e2b..348e12371 100644 --- a/src/xenia/hid/premake5.lua +++ b/src/xenia/hid/premake5.lua @@ -41,11 +41,11 @@ project("xenia-hid-demo") filter("platforms:Linux") links({ + "SDL2", + "vulkan", "X11", "xcb", "X11-xcb", - "vulkan", - "SDL2", }) filter("platforms:Windows")