[Travis] Enable full Xenia build on linux

This commit is contained in:
DrChat
2017-12-20 16:27:01 -06:00
parent 7b956d3c04
commit 9395b73217
7 changed files with 34 additions and 9 deletions

View File

@@ -65,7 +65,7 @@ script:
# - if [[ $BUILD == true ]]; then ./build/bin/Linux/$CONFIG/xenia-cpu-ppc-tests --log_file=stdout; fi # - if [[ $BUILD == true ]]; then ./build/bin/Linux/$CONFIG/xenia-cpu-ppc-tests --log_file=stdout; fi
# Build all of xenia. # 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). # All tests (without haswell support).
#- ./xenia-build test --config=debug --no-build -- --enable_haswell_instructions=false #- ./xenia-build test --config=debug --no-build -- --enable_haswell_instructions=false
# All tests (with haswell support). # All tests (with haswell support).

View File

@@ -10,6 +10,7 @@ project("xenia-app")
links({ links({
"capstone", "capstone",
"gflags", "gflags",
"glew",
"glslang-spirv", "glslang-spirv",
"imgui", "imgui",
"libavcodec", "libavcodec",

View File

@@ -6,6 +6,7 @@ test_suite("xenia-cpu-tests", project_root, ".", {
project_root.."/third_party/gflags/src", project_root.."/third_party/gflags/src",
}, },
links = { links = {
"capstone",
"xenia-base", "xenia-base",
"xenia-core", "xenia-core",
"xenia-cpu", "xenia-cpu",

View File

@@ -30,25 +30,28 @@ project("xenia-gpu-gl4-trace-viewer")
kind("WindowedApp") kind("WindowedApp")
language("C++") language("C++")
links({ links({
"capstone",
"gflags", "gflags",
"glew", "glew",
"imgui", "imgui",
"libavcodec",
"libavutil",
"snappy",
"xenia-apu", "xenia-apu",
"xenia-apu-nop", "xenia-apu-nop",
"xenia-apu-xaudio2",
"xenia-base", "xenia-base",
"xenia-core", "xenia-core",
"xenia-cpu", "xenia-cpu",
"xenia-cpu-backend-x64", "xenia-cpu-backend-x64",
"xenia-gpu", "xenia-gpu",
"xenia-gpu-gl4", "xenia-gpu-gl4",
"xenia-hid",
"xenia-hid-nop", "xenia-hid-nop",
"xenia-hid-winkey",
"xenia-hid-xinput",
"xenia-kernel", "xenia-kernel",
"xenia-ui", "xenia-ui",
"xenia-ui-gl", "xenia-ui-gl",
"xenia-vfs", "xenia-vfs",
"xxhash",
}) })
flags({ flags({
"WinMain", -- Use WinMain instead of main. "WinMain", -- Use WinMain instead of main.
@@ -66,6 +69,12 @@ project("xenia-gpu-gl4-trace-viewer")
}) })
filter("platforms:Windows") filter("platforms:Windows")
links({
"xenia-apu-xaudio2",
"xenia-hid-winkey",
"xenia-hid-xinput",
})
-- Only create the .user file if it doesn't already exist. -- Only create the .user file if it doesn't already exist.
local user_file = project_root.."/build/xenia-gpu-gl4-trace-viewer.vcxproj.user" local user_file = project_root.."/build/xenia-gpu-gl4-trace-viewer.vcxproj.user"
if not os.isfile(user_file) then if not os.isfile(user_file) then

View File

@@ -10,6 +10,7 @@
#include <gflags/gflags.h> #include <gflags/gflags.h>
#include <cinttypes> #include <cinttypes>
#include <cstring>
#include <string> #include <string>
#include <vector> #include <vector>

View File

@@ -32,26 +32,31 @@ project("xenia-gpu-vulkan-trace-viewer")
kind("WindowedApp") kind("WindowedApp")
language("C++") language("C++")
links({ links({
"capstone",
"gflags", "gflags",
"glslang-spirv",
"imgui", "imgui",
"libavcodec",
"libavutil",
"snappy",
"spirv-tools",
"vulkan-loader", "vulkan-loader",
"xenia-apu", "xenia-apu",
"xenia-apu-nop", "xenia-apu-nop",
"xenia-apu-xaudio2",
"xenia-base", "xenia-base",
"xenia-core", "xenia-core",
"xenia-cpu", "xenia-cpu",
"xenia-cpu-backend-x64", "xenia-cpu-backend-x64",
"xenia-gpu", "xenia-gpu",
"xenia-gpu-vulkan", "xenia-gpu-vulkan",
"xenia-hid",
"xenia-hid-nop", "xenia-hid-nop",
"xenia-hid-winkey",
"xenia-hid-xinput",
"xenia-kernel", "xenia-kernel",
"xenia-ui", "xenia-ui",
"xenia-ui-spirv", "xenia-ui-spirv",
"xenia-ui-vulkan", "xenia-ui-vulkan",
"xenia-vfs", "xenia-vfs",
"xxhash",
}) })
flags({ flags({
"WinMain", -- Use WinMain instead of main. "WinMain", -- Use WinMain instead of main.
@@ -67,6 +72,12 @@ project("xenia-gpu-vulkan-trace-viewer")
}) })
filter("platforms:Windows") filter("platforms:Windows")
links({
"xenia-apu-xaudio2",
"xenia-hid-winkey",
"xenia-hid-xinput",
})
-- Only create the .user file if it doesn't already exist. -- Only create the .user file if it doesn't already exist.
local user_file = project_root.."/build/xenia-gpu-vulkan-trace-viewer.vcxproj.user" local user_file = project_root.."/build/xenia-gpu-vulkan-trace-viewer.vcxproj.user"
if not os.isfile(user_file) then if not os.isfile(user_file) then

View File

@@ -176,8 +176,10 @@ void DrawUserInputStatus(uint32_t user_index) {
ImGui::Text(" Shoulders: [%c][%c]", ImGui::Text(" Shoulders: [%c][%c]",
gamepad.buttons & X_INPUT_GAMEPAD_LEFT_SHOULDER ? 'L' : ' ', gamepad.buttons & X_INPUT_GAMEPAD_LEFT_SHOULDER ? 'L' : ' ',
gamepad.buttons & X_INPUT_GAMEPAD_RIGHT_SHOULDER ? 'R' : ' '); gamepad.buttons & X_INPUT_GAMEPAD_RIGHT_SHOULDER ? 'R' : ' ');
ImGui::Text(" Left Trigger: %3u", gamepad.left_trigger); ImGui::Text(" Left Trigger: %3u",
ImGui::Text(" Right Trigger: %3u", gamepad.right_trigger); 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", ImGui::Text(" Left Thumb: %6d, %6d",
static_cast<int32_t>(gamepad.thumb_lx), static_cast<int32_t>(gamepad.thumb_lx),
static_cast<int32_t>(gamepad.thumb_ly)); static_cast<int32_t>(gamepad.thumb_ly));