diff options
| author | DrChat <arkolbed@gmail.com> | 2017-12-20 16:27:01 -0600 |
|---|---|---|
| committer | DrChat <arkolbed@gmail.com> | 2017-12-20 16:27:01 -0600 |
| commit | 9395b73217ca91f5f0c9e8ef7e3bd2126350f4e3 (patch) | |
| tree | ca8337fdf02951a4c35b754221254519d181bc57 | |
| parent | 7b956d3c04a57e6fbef91111c64521a78846e38e (diff) | |
[Travis] Enable full Xenia build on linux
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | src/xenia/app/premake5.lua | 1 | ||||
| -rw-r--r-- | src/xenia/cpu/testing/premake5.lua | 1 | ||||
| -rw-r--r-- | src/xenia/gpu/gl4/premake5.lua | 15 | ||||
| -rw-r--r-- | src/xenia/gpu/shader_compiler_main.cc | 1 | ||||
| -rw-r--r-- | src/xenia/gpu/vulkan/premake5.lua | 17 | ||||
| -rw-r--r-- | src/xenia/hid/hid_demo.cc | 6 |
7 files changed, 34 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index e3a6300f9..b49ca0652 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,7 +65,7 @@ script: # - if [[ $BUILD == true ]]; then ./build/bin/Linux/$CONFIG/xenia-cpu-ppc-tests --log_file=stdout; fi # Build all of xenia. - #- if [[ $BUILD == true ]]; then ./xenia-build build --config=$CONFIG; fi + - if [[ $BUILD == true ]]; then ./xenia-build build --config=$CONFIG; fi # All tests (without haswell support). #- ./xenia-build test --config=debug --no-build -- --enable_haswell_instructions=false # All tests (with haswell support). diff --git a/src/xenia/app/premake5.lua b/src/xenia/app/premake5.lua index 5803ea4f9..a999512c4 100644 --- a/src/xenia/app/premake5.lua +++ b/src/xenia/app/premake5.lua @@ -10,6 +10,7 @@ project("xenia-app") links({ "capstone", "gflags", + "glew", "glslang-spirv", "imgui", "libavcodec", diff --git a/src/xenia/cpu/testing/premake5.lua b/src/xenia/cpu/testing/premake5.lua index 0d677f4e9..30e60604f 100644 --- a/src/xenia/cpu/testing/premake5.lua +++ b/src/xenia/cpu/testing/premake5.lua @@ -6,6 +6,7 @@ test_suite("xenia-cpu-tests", project_root, ".", { project_root.."/third_party/gflags/src", }, links = { + "capstone", "xenia-base", "xenia-core", "xenia-cpu", diff --git a/src/xenia/gpu/gl4/premake5.lua b/src/xenia/gpu/gl4/premake5.lua index 64fb97d78..6c61b285a 100644 --- a/src/xenia/gpu/gl4/premake5.lua +++ b/src/xenia/gpu/gl4/premake5.lua @@ -30,25 +30,28 @@ project("xenia-gpu-gl4-trace-viewer") kind("WindowedApp") language("C++") links({ + "capstone", "gflags", "glew", "imgui", + "libavcodec", + "libavutil", + "snappy", "xenia-apu", "xenia-apu-nop", - "xenia-apu-xaudio2", "xenia-base", "xenia-core", "xenia-cpu", "xenia-cpu-backend-x64", "xenia-gpu", "xenia-gpu-gl4", + "xenia-hid", "xenia-hid-nop", - "xenia-hid-winkey", - "xenia-hid-xinput", "xenia-kernel", "xenia-ui", "xenia-ui-gl", "xenia-vfs", + "xxhash", }) flags({ "WinMain", -- Use WinMain instead of main. @@ -66,6 +69,12 @@ project("xenia-gpu-gl4-trace-viewer") }) filter("platforms:Windows") + links({ + "xenia-apu-xaudio2", + "xenia-hid-winkey", + "xenia-hid-xinput", + }) + -- Only create the .user file if it doesn't already exist. local user_file = project_root.."/build/xenia-gpu-gl4-trace-viewer.vcxproj.user" if not os.isfile(user_file) then diff --git a/src/xenia/gpu/shader_compiler_main.cc b/src/xenia/gpu/shader_compiler_main.cc index dd0657bfb..a1575bdc8 100644 --- a/src/xenia/gpu/shader_compiler_main.cc +++ b/src/xenia/gpu/shader_compiler_main.cc @@ -10,6 +10,7 @@ #include <gflags/gflags.h> #include <cinttypes> +#include <cstring> #include <string> #include <vector> diff --git a/src/xenia/gpu/vulkan/premake5.lua b/src/xenia/gpu/vulkan/premake5.lua index 5212fddfd..3e41ca44d 100644 --- a/src/xenia/gpu/vulkan/premake5.lua +++ b/src/xenia/gpu/vulkan/premake5.lua @@ -32,26 +32,31 @@ project("xenia-gpu-vulkan-trace-viewer") kind("WindowedApp") language("C++") links({ + "capstone", "gflags", + "glslang-spirv", "imgui", + "libavcodec", + "libavutil", + "snappy", + "spirv-tools", "vulkan-loader", "xenia-apu", "xenia-apu-nop", - "xenia-apu-xaudio2", "xenia-base", "xenia-core", "xenia-cpu", "xenia-cpu-backend-x64", "xenia-gpu", "xenia-gpu-vulkan", + "xenia-hid", "xenia-hid-nop", - "xenia-hid-winkey", - "xenia-hid-xinput", "xenia-kernel", "xenia-ui", "xenia-ui-spirv", "xenia-ui-vulkan", "xenia-vfs", + "xxhash", }) flags({ "WinMain", -- Use WinMain instead of main. @@ -67,6 +72,12 @@ project("xenia-gpu-vulkan-trace-viewer") }) filter("platforms:Windows") + links({ + "xenia-apu-xaudio2", + "xenia-hid-winkey", + "xenia-hid-xinput", + }) + -- Only create the .user file if it doesn't already exist. local user_file = project_root.."/build/xenia-gpu-vulkan-trace-viewer.vcxproj.user" if not os.isfile(user_file) then diff --git a/src/xenia/hid/hid_demo.cc b/src/xenia/hid/hid_demo.cc index 3ea662a0a..70c84a35f 100644 --- a/src/xenia/hid/hid_demo.cc +++ b/src/xenia/hid/hid_demo.cc @@ -176,8 +176,10 @@ void DrawUserInputStatus(uint32_t user_index) { ImGui::Text(" Shoulders: [%c][%c]", gamepad.buttons & X_INPUT_GAMEPAD_LEFT_SHOULDER ? 'L' : ' ', gamepad.buttons & X_INPUT_GAMEPAD_RIGHT_SHOULDER ? 'R' : ' '); - ImGui::Text(" Left Trigger: %3u", gamepad.left_trigger); - ImGui::Text(" Right Trigger: %3u", gamepad.right_trigger); + ImGui::Text(" Left Trigger: %3u", + static_cast<uint16_t>(gamepad.left_trigger)); + ImGui::Text(" Right Trigger: %3u", + static_cast<uint16_t>(gamepad.right_trigger)); ImGui::Text(" Left Thumb: %6d, %6d", static_cast<int32_t>(gamepad.thumb_lx), static_cast<int32_t>(gamepad.thumb_ly)); |
