Emulation/Avocado
1
0
Fork 0
mirror of https://github.com/JaCzekanski/Avocado.git synced 2024-05-20 12:57:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

project: refactored Premake, macOS builds

Browse source
This commit is contained in:
Jakub Czekański 2019-01-20 14:55:37 +01:00
parent 20d025ab80
commit 1abb81b983
17 changed files with 315 additions and 262 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.appveyor.yml
View file

@ -5,7 +5,7 @@ os:
- Visual Studio 2017
environment:
PREMAKE_VERSION: 5.0.0-alpha12
PREMAKE_VERSION: 5.0.0-alpha13
SDL_VERSION: 2.0.9
matrix:
- TOOLSET: vs2017

18
.travis.yml
View file

@ -1,15 +1,23 @@
language: cpp
matrix:
include:
- os: linux
env: NAME=clang6
- name: "Linux Clang6"
os: linux
sudo: required
dist: trusty
cache: ccache
install: "./.travis/linux/pull-container.sh"
script: "./.travis/linux/run-container.sh"
after_success: "./.travis/linux/notify-discord.sh success $WEBHOOK_URL"
after_failure: "./.travis/linux/notify-discord.sh failure $WEBHOOK_URL"
after_success: "./.travis/notify-discord.sh success $WEBHOOK_URL"
after_failure: "./.travis/notify-discord.sh failure $WEBHOOK_URL"
- name: "macOS"
os: osx
osx_image: xcode10.1
cache: ccache
install: "./.travis/macos/install-dependencies.sh"
script: "./.travis/macos/build.sh"
after_success: "./.travis/notify-discord.sh success $WEBHOOK_URL"
after_failure: "./.travis/notify-discord.sh failure $WEBHOOK_URL"
notifications:
- email: false

41
.travis/linux/build.sh
View file

@ -1,29 +1,21 @@
#!/bin/bash -ex
# Run by run-container.sh, builds Avocado in Docker container and runs tests
export OS=linux64
export DATE=`date +%Y%m%d`
export COMMIT=`git rev-parse --short=7 HEAD`
export ARTIFACT=avocado-$OS-$DATE-$COMMIT
export CC="ccache clang-6.0 -fcolor-diagnostics"
export CXX="ccache clang++-6.0 -fcolor-diagnostics"
cd /home/build
export BASE=$PWD
export PATH=$PATH:$PWD/build/externals/SDL2/bin
export PREFIX=$PWD/build/externals/SDL2
export PKG_CONFIG_PATH=$PREFIX/lib/pkgconfig
# Check if SDL2 is available
if [ ! -d "$PREFIX" ]; then
# Build SDL2
mkdir -p build/externals/SDL2
cd externals/SDL2
./configure --prefix=$PREFIX
make -j4
make install
else
echo "SDL2 already built, skipping"
fi
# Download SDL2
apt update
apt install -y --no-install-recommends libsdl2-dev
# Generate Makefile
cd $BASE
premake5 gmake
# Build
@ -31,7 +23,20 @@ make config=release_x64 -j4
ccache -s
# Tests
./build/release_x64/avocado_test --use-colour yes --success || true
./build/release_x64/avocado_test --use-colour yes
wget -nv https://gist.github.com/JaCzekanski/d7a6e06295729a3f81bd9bd488e9d37d/raw/d5bc41278fd198ef5e4afceb35e0587aca7f2f60/gte_valid_0xc0ffee_50.log
./build/release_x64/avocado_autotest gte_valid_0xc0ffee_50.log || true
./build/release_x64/avocado_autotest gte_valid_0xc0ffee_50.log
# Package
mkdir -p $ARTIFACT
export TARGETDIR=build/release_x64
cp $TARGETDIR/avocado $ARTIFACT/avocado
cp -r data $ARTIFACT/
# Remove .gitignore and asm dir
find $ARTIFACT -type f -name .gitignore -exec rm {} \;
rm -r $ARTIFACT/data/asm
mkdir -p upload
tar -zcf upload/$ARTIFACT.tar.gz $ARTIFACT

35
.travis/macos/build.sh Executable file
View file

@ -0,0 +1,35 @@
#!/bin/bash -ex
export OS=macos
export DATE=`date +%Y%m%d`
export COMMIT=`git rev-parse --short=7 HEAD`
export ARTIFACT=avocado-$OS-$DATE-$COMMIT
export CC="ccache clang"
export CXX="ccache clang++"
# Generate Makefile
premake5 gmake
# Build
make config=release_x64 -j4
ccache -s
# Tests
./build/release_x64/avocado_test --use-colour yes
wget -nv https://gist.github.com/JaCzekanski/d7a6e06295729a3f81bd9bd488e9d37d/raw/d5bc41278fd198ef5e4afceb35e0587aca7f2f60/gte_valid_0xc0ffee_50.log
./build/release_x64/avocado_autotest gte_valid_0xc0ffee_50.log
# Package
mkdir -p $ARTIFACT
export TARGETDIR=build/release_x64
cp $TARGETDIR/avocado.app $ARTIFACT/avocado.app
cp -r data $ARTIFACT/
# Remove .gitignore and asm dir
find $ARTIFACT -type f -name .gitignore -exec rm {} \;
rm -r $ARTIFACT/data/asm
mkdir -p upload
tar -zcf upload/$ARTIFACT.tar.gz $ARTIFACT

13
.travis/macos/install-dependencies.sh Executable file
View file

@ -0,0 +1,13 @@
#!/bin/bash -ex
export PREMAKE_VERSION="5.0.0-alpha13"
# Download Premake5
wget -nv https://github.com/premake/premake-core/releases/download/v$PREMAKE_VERSION/premake-$PREMAKE_VERSION-macosx.tar.gz
tar xzf premake-$PREMAKE_VERSION-macosx.tar.gz
mv premake5 /usr/local/bin/
rm premake-$PREMAKE_VERSION-macosx.tar.gz
# Download SDL2 and ccache
brew update
brew install sdl2 ccache

7
.travis/linux/notify-discord.sh → .travis/notify-discord.sh
View file

@ -43,7 +43,7 @@ else
URL=""
fi
TIMESTAMP=$(date --utc +%FT%TZ)
TIMESTAMP=$(date +%FT%TZ)
WEBHOOK_DATA='{
"username": "",
"avatar_url": "https://travis-ci.org/images/logos/TravisCI-Mascot-1.png",
@ -63,6 +63,11 @@ WEBHOOK_DATA='{
"value": "'"[\`${TRAVIS_COMMIT:0:7}\`](https://github.com/$TRAVIS_REPO_SLUG/commit/$TRAVIS_COMMIT)"'",
"inline": true
},
{
"name": "Job",
"value": "'"$TRAVIS_JOB_NAME"'",
"inline": true
},
{
"name": "Branch/Tag",
"value": "'"[\`$TRAVIS_BRANCH\`](https://github.com/$TRAVIS_REPO_SLUG/tree/$TRAVIS_BRANCH)"'",

23
premake/chdr.lua Normal file
View file

@ -0,0 +1,23 @@
group "externals"
project "chdr"
uuid "d148de3d-efbb-4f1d-88bc-a112be68fc04"
kind "StaticLib"
language "c"
location "../build/libs/chdr"
includedirs {
"../externals/flac/include",
"../externals/lzma/C",
"../externals/libchdr/src",
"../externals/miniz",
}
files {
"../externals/libchdr/src/*.c",
}
defines {
"FLAC__NO_DLL",
}
links {
"miniz",
"lzma",
"flac",
}

45
premake/flac.lua Normal file
View file

@ -0,0 +1,45 @@
group "externals"
project "flac"
uuid "2f208b4f-2e69-408e-b0df-b0e72b031b02"
kind "StaticLib"
language "c"
location "../build/libs/flac"
includedirs {
"../externals/flac/src/libFLAC/include",
"../externals/flac/include",
}
files {
"../externals/flac/src/libFLAC/bitmath.c",
"../externals/flac/src/libFLAC/bitreader.c",
"../externals/flac/src/libFLAC/cpu.c",
"../externals/flac/src/libFLAC/crc.c",
"../externals/flac/src/libFLAC/fixed.c",
"../externals/flac/src/libFLAC/fixed_intrin_sse2.c",
"../externals/flac/src/libFLAC/fixed_intrin_ssse3.c",
"../externals/flac/src/libFLAC/float.c",
"../externals/flac/src/libFLAC/format.c",
"../externals/flac/src/libFLAC/lpc.c",
"../externals/flac/src/libFLAC/lpc_intrin_avx2.c",
"../externals/flac/src/libFLAC/lpc_intrin_sse2.c",
"../externals/flac/src/libFLAC/lpc_intrin_sse41.c",
"../externals/flac/src/libFLAC/lpc_intrin_sse.c",
"../externals/flac/src/libFLAC/md5.c",
"../externals/flac/src/libFLAC/memory.c",
"../externals/flac/src/libFLAC/metadata_iterators.c",
"../externals/flac/src/libFLAC/metadata_object.c",
"../externals/flac/src/libFLAC/stream_decoder.c",
"../externals/flac/src/libFLAC/window.c",
}
filter "system:windows"
files {
"../externals/flac/src/libFLAC/windows_unicode_filenames.c",
}
filter {}
defines {
"PACKAGE_VERSION=\"1.3.2\"",
"FLAC__HAS_OGG=0",
"FLAC__NO_DLL",
"HAVE_LROUND",
"HAVE_STDINT_H",
"HAVE_STDLIB_H",
}

12
premake/glad.lua Normal file
View file

@ -0,0 +1,12 @@
group "externals"
project "glad"
uuid "9add6bd2-2372-4614-a367-2e8863415083"
kind "StaticLib"
language "c"
location "../build/libs/glad"
includedirs {
"../externals/glad/include"
}
files {
"../externals/glad/src/*.c",
}

12
premake/imgui.lua Normal file
View file

@ -0,0 +1,12 @@
group "externals"
project "imgui"
uuid "a8f18b69-f15a-4804-80f7-e8f80ab91369"
kind "StaticLib"
location "../build/libs/imgui"
includedirs {
"../externals/imgui",
"../externals/glad/include",
}
files {
"../externals/imgui/*.cpp",
}

27
premake/lzma.lua Normal file
View file

@ -0,0 +1,27 @@
group "externals"
project "lzma"
uuid "af99f9c5-e14a-4478-bac5-07d457753d35"
kind "StaticLib"
language "c"
location "../build/libs/lzma"
includedirs {
"../externals/lzma/C",
}
files {
"../externals/lzma/C/Alloc.c",
"../externals/lzma/C/Bra86.c",
"../externals/lzma/C/Bra.c",
"../externals/lzma/C/BraIA64.c",
"../externals/lzma/C/CpuArch.c",
"../externals/lzma/C/Delta.c",
"../externals/lzma/C/LzFind.c",
"../externals/lzma/C/Lzma86Dec.c",
"../externals/lzma/C/Lzma86Enc.c",
"../externals/lzma/C/LzmaDec.c",
"../externals/lzma/C/LzmaEnc.c",
"../externals/lzma/C/LzmaLib.c",
"../externals/lzma/C/Sort.c",
}
defines {
"_7ZIP_ST"
}

12
premake/miniz.lua Normal file
View file

@ -0,0 +1,12 @@
group "externals"
project "miniz"
uuid "4D28CBE8-3092-4400-B67B-FD51FCAFBD34"
kind "StaticLib"
language "c"
location "../build/libs/miniz"
includedirs {
"../externals/miniz"
}
files {
"../externals/miniz/*.c",
}

52
premake/tools.lua Normal file
View file

@ -0,0 +1,52 @@
function generateVersionFile()
local version = getSingleLineOutput('git describe --exact-match')
local branch = getSingleLineOutput('git symbolic-ref --short -q HEAD')
local commit = getSingleLineOutput('git rev-parse --short=7 HEAD')
local date = os.date("!%Y-%m-%d %H:%M:%S")
if os.getenv("APPVEYOR") == "True" then
branch = os.getenv("APPVEYOR_REPO_BRANCH")
end
local versionString = ''
if version == '' then
versionString = string.format("%s-%s (%s)", branch, commit, date)
else
versionString = string.format("v%s", version)
end
versionString = versionString .. " \" BUILD_ARCH \""
f = io.open('src/version.h', 'w')
f:write('#pragma once\n')
f:write(string.format('#ifndef BUILD_ARCH\n'))
f:write(string.format(' #define BUILD_ARCH "UNKNOWN-ARCH"\n'))
f:write(string.format('#endif\n'))
f:write(string.format('#define BUILD_VERSION "%s"\n', version))
f:write(string.format('#define BUILD_BRANCH "%s"\n', branch))
f:write(string.format('#define BUILD_COMMIT "%s"\n', commit))
f:write(string.format('#define BUILD_DATE "%s"\n', date))
f:write(string.format('#define BUILD_STRING "%s"\n', versionString))
f:close()
end
function getSingleLineOutput(command)
return string.gsub(getOutput(command), '\n', '')
end
function getOutput(command)
local nullDevice = ''
if package.config:sub(1,1) == '\\' then
nullDevice = 'NUL'
else
nullDevice = '/dev/null'
end
local file = io.popen(command .. ' 2> ' .. nullDevice, 'r')
local output = file:read('*all')
file:close()
return output
end

268
premake5.lua
View file

@ -1,57 +1,7 @@
function generateVersionFile()
local version = getSingleLineOutput('git describe --exact-match')
local branch = getSingleLineOutput('git symbolic-ref --short -q HEAD')
local commit = getSingleLineOutput('git rev-parse --short=6 HEAD')
local date = os.date("!%Y-%m-%d %H:%M:%S")
if os.getenv("APPVEYOR") == "True" then
branch = os.getenv("APPVEYOR_REPO_BRANCH")
end
local versionString = ''
if version == '' then
versionString = string.format("%s-%s (%s)", branch, commit, date)
else
versionString = string.format("v%s", version)
end
versionString = versionString .. " \" BUILD_ARCH \""
f = io.open('src/version.h', 'w')
f:write('#pragma once\n')
f:write(string.format('#ifndef BUILD_ARCH\n'))
f:write(string.format(' #define BUILD_ARCH "UNKNOWN-ARCH"\n'))
f:write(string.format('#endif\n'))
f:write(string.format('#define BUILD_VERSION "%s"\n', version))
f:write(string.format('#define BUILD_BRANCH "%s"\n', branch))
f:write(string.format('#define BUILD_COMMIT "%s"\n', commit))
f:write(string.format('#define BUILD_DATE "%s"\n', date))
f:write(string.format('#define BUILD_STRING "%s"\n', versionString))
f:close()
end
function getSingleLineOutput(command)
return string.gsub(getOutput(command), '\n', '')
end
function getOutput(command)
local nullDevice = ''
if package.config:sub(1,1) == '\\' then
nullDevice = 'NUL'
else
nullDevice = '/dev/null'
end
local file = io.popen(command .. ' 2> ' .. nullDevice, 'r')
local output = file:read('*all')
file:close()
return output
end
include "premake/tools.lua"
workspace "Avocado"
configurations { "debug", "release", "fast_debug" }
configurations { "debug", "release" }
platforms {"x86", "x64"}
startproject "avocado"
defaultplatform "x86"
@ -89,7 +39,7 @@ filter "system:macosx"
}
filter {"kind:*App"}
filter "kind:*App"
targetdir "build/%{cfg.buildcfg}_%{cfg.platform}"
filter {"kind:*App", "platforms:x86"}
@ -101,168 +51,34 @@ filter "configurations:Debug"
symbols "On"
filter "configurations:Release"
staticruntime "on"
defines { "NDEBUG" }
flags { "MultiProcessorCompile" }
optimize "Full"
filter "configurations:FastDebug"
defines { "DEBUG" }
symbols "On"
optimize "Speed"
editandcontinue "On"
filter {"configurations:Release", "system:windows or system:macosx"}
flags { "LinkTimeOptimization" }
filter {"action:vs*"}
flags { "MultiProcessorCompile" }
filter "action:vs*"
defines "_CRT_SECURE_NO_WARNINGS"
filter {"action:vs*", "configurations:Release"}
flags {
"LinkTimeOptimization",
"StaticRuntime"
}
filter "action:gmake"
buildoptions {
"-Wall",
"-Wextra",
"-Wno-unused-parameter",
}
project "glad"
uuid "9add6bd2-2372-4614-a367-2e8863415083"
kind "StaticLib"
language "c"
location "build/libs/glad"
includedirs {
"externals/glad/include"
}
files {
"externals/glad/src/*.c",
}
include "premake/glad.lua"
include "premake/miniz.lua"
include "premake/imgui.lua"
include "premake/flac.lua"
include "premake/chdr.lua"
include "premake/lzma.lua"
project "miniz"
uuid "4D28CBE8-3092-4400-B67B-FD51FCAFBD34"
kind "StaticLib"
language "c"
location "build/libs/miniz"
includedirs {
"externals/miniz"
}
files {
"externals/miniz/*.c",
}
project "imgui"
uuid "a8f18b69-f15a-4804-80f7-e8f80ab91369"
kind "StaticLib"
location "build/libs/imgui"
includedirs {
"externals/imgui",
"externals/glad/include",
}
files {
"externals/imgui/*.cpp",
}
project "flac"
uuid "2f208b4f-2e69-408e-b0df-b0e72b031b02"
kind "StaticLib"
language "c"
location "build/libs/flac"
includedirs {
"externals/flac/src/libFLAC/include",
"externals/flac/include",
}
files {
"externals/flac/src/libFLAC/bitmath.c",
"externals/flac/src/libFLAC/bitreader.c",
"externals/flac/src/libFLAC/cpu.c",
"externals/flac/src/libFLAC/crc.c",
"externals/flac/src/libFLAC/fixed.c",
"externals/flac/src/libFLAC/fixed_intrin_sse2.c",
"externals/flac/src/libFLAC/fixed_intrin_ssse3.c",
"externals/flac/src/libFLAC/float.c",
"externals/flac/src/libFLAC/format.c",
"externals/flac/src/libFLAC/lpc.c",
"externals/flac/src/libFLAC/lpc_intrin_avx2.c",
"externals/flac/src/libFLAC/lpc_intrin_sse2.c",
"externals/flac/src/libFLAC/lpc_intrin_sse41.c",
"externals/flac/src/libFLAC/lpc_intrin_sse.c",
"externals/flac/src/libFLAC/md5.c",
"externals/flac/src/libFLAC/memory.c",
"externals/flac/src/libFLAC/metadata_iterators.c",
"externals/flac/src/libFLAC/metadata_object.c",
"externals/flac/src/libFLAC/stream_decoder.c",
"externals/flac/src/libFLAC/window.c",
}
filter "system:windows"
files {
"externals/flac/src/libFLAC/windows_unicode_filenames.c",
}
filter {}
defines {
"PACKAGE_VERSION=\"1.3.2\"",
"FLAC__HAS_OGG=0",
"FLAC__NO_DLL",
"HAVE_LROUND",
"HAVE_STDINT_H",
"HAVE_STDLIB_H",
}
project "lzma"
uuid "af99f9c5-e14a-4478-bac5-07d457753d35"
kind "StaticLib"
language "c"
location "build/libs/lzma"
includedirs {
"externals/lzma/C",
}
files {
"externals/lzma/C/Alloc.c",
"externals/lzma/C/Bra86.c",
"externals/lzma/C/Bra.c",
"externals/lzma/C/BraIA64.c",
"externals/lzma/C/CpuArch.c",
"externals/lzma/C/Delta.c",
"externals/lzma/C/LzFind.c",
"externals/lzma/C/Lzma86Dec.c",
"externals/lzma/C/Lzma86Enc.c",
"externals/lzma/C/LzmaDec.c",
"externals/lzma/C/LzmaEnc.c",
"externals/lzma/C/LzmaLib.c",
"externals/lzma/C/Sort.c",
}
defines {
"_7ZIP_ST"
}
project "chdr"
uuid "d148de3d-efbb-4f1d-88bc-a112be68fc04"
kind "StaticLib"
language "c"
location "build/libs/chdr"
includedirs {
"externals/flac/include",
"externals/lzma/C",
"externals/libchdr/src",
"externals/miniz",
}
files {
"externals/libchdr/src/*.c",
}
defines {
"FLAC__NO_DLL",
}
links {
"miniz",
"lzma",
"flac",
}
project "common"
project "core"
uuid "176665c5-37ff-4a42-bef8-02edaeb1b426"
kind "StaticLib"
location "build/libs/common"
location "build/libs/core"
includedirs {
"src",
@ -290,12 +106,6 @@ project "common"
"chdr",
}
filter "system:windows"
defines "WIN32"
filter {"action:gmake", "system:windows"}
defines {"_CRT_SECURE_NO_WARNINGS"}
if _ACTION ~= nil then
generateVersionFile()
end
@ -310,7 +120,6 @@ project "avocado"
"src",
"externals/imgui",
"externals/glad/include",
"externals/SDL2/include",
"externals/glm",
"externals/json/include",
"externals/stb",
@ -318,15 +127,23 @@ project "avocado"
}
links {
"common",
"core",
"miniz",
"chdr",
"lzma",
"flac",
}
filter "system:windows"
defines "WIN32"
filter "options:headless"
files {
"src/platform/headless/**.cpp",
"src/platform/headless/**.h"
}
filter {"system:windows", "not options:headless"}
includedirs {
"externals/SDL2/include",
}
files {
"src/imgui/**.*",
"src/renderer/opengl/**.*",
@ -338,19 +155,14 @@ project "avocado"
"imgui",
"OpenGL32"
}
filter "platforms:x86"
libdirs "externals/SDL2/lib/x86"
filter {"system:windows", "not options:headless", "platforms:x86"}
libdirs "externals/SDL2/lib/x86"
filter "platforms:x64"
libdirs "externals/SDL2/lib/x64"
filter {"system:windows", "not options:headless", "platforms:x64"}
libdirs "externals/SDL2/lib/x64"
filter {"system:linux", "options:headless"}
files {
"src/platform/headless/**.cpp",
"src/platform/headless/**.h"
}
-- TODO: Make headless and normal configurations
filter {"system:linux", "not options:headless"}
files {
"src/imgui/**.*",
@ -366,7 +178,7 @@ project "avocado"
linkoptions {getOutput("sdl2-config --libs")}
filter "system:macosx"
filter {"system:macosx", "not options:headless"}
kind "WindowedApp"
files {
"src/imgui/**.*",
@ -388,11 +200,6 @@ project "avocado_test"
includedirs {
"src",
"externals/imgui",
"externals/glad/include",
"externals/SDL2/include",
"externals/glm",
"externals/json/src",
"externals/catch/single_include"
}
@ -403,7 +210,7 @@ project "avocado_test"
}
links {
"common"
"core"
}
project "avocado_autotest"
@ -414,11 +221,6 @@ project "avocado_autotest"
includedirs {
"src",
"externals/imgui",
"externals/glad/include",
"externals/SDL2/include",
"externals/glm",
"externals/json/src"
}
files {
@ -428,5 +230,5 @@ project "avocado_autotest"
}
links {
"common"
"core"
}

3
src/config.cpp
View file

@ -168,7 +168,8 @@ const json defaultConfig = {
{ "bios", 0u },
{ "cdrom", 0u },
{ "memoryCard", 1u },
{ "controller", 1u }
{ "controller", 1u },
{ "dma", 0u }
}}
}},
{"memoryCard", {

3
src/device/dma/dma_channel.cpp
View file

@ -1,9 +1,10 @@
#include "dma_channel.h"
#include <cstdio>
#include "config.h"
#include "system.h"
namespace device::dma::dmaChannel {
DMAChannel::DMAChannel(int channel, System* sys) : channel(channel), sys(sys) {}
DMAChannel::DMAChannel(int channel, System* sys) : channel(channel), sys(sys) { verbose = (int)config["debug"]["log"]["dma"]; }
DMAChannel::~DMAChannel() {}

4
src/platform/windows/main.cpp
View file

@ -214,7 +214,7 @@ int main(int argc, char** argv) {
loadConfigFile(CONFIG_NAME);
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO) != 0) {
printf("Cannot init SDL\n");
printf("Cannot init SDL (%s)\n", SDL_GetError());
return 1;
}
@ -235,7 +235,7 @@ int main(int argc, char** argv) {
SDL_GLContext glContext = SDL_GL_CreateContext(window);
if (glContext == nullptr) {
printf("Cannot create OpenGL context\n");
printf("Cannot create OpenGL context (%s)\n", SDL_GetError());
return 1;
}