Skip to content

Commit

Permalink
Added CI
Browse files Browse the repository at this point in the history
  • Loading branch information
AdventureT committed Nov 9, 2023
1 parent 46b9a28 commit e268445
Show file tree
Hide file tree
Showing 5 changed files with 61 additions and 38 deletions.
50 changes: 50 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Toshi

on:
push:
branches: [ "master" ]
pull_request:
branches: [ "master" ]

env:
# Path to the solution file relative to the root of the project.
SOLUTION_FILE_PATH: .

# Configuration type to build.
BUILD_CONFIGURATION: Release

permissions:
contents: read

jobs:
build:
env:
PREMAKE_VERSION: 5.0.0-beta2

runs-on: windows-latest

steps:
- uses: actions/checkout@v3
with:
submodules: recursive

- name: Setup premake
uses: abel0b/setup-premake@v2.3
with:
version: ${{ env.PREMAKE_VERSION }}

- name: Premake
run: premake5 vs2022 --arch=x86

- name: Add MSBuild to PATH
uses: microsoft/setup-msbuild@v1.1

- name: Build Toshi
working-directory: ${{env.GITHUB_WORKSPACE}}
run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}

- name: Publish Artifact
uses: actions/upload-artifact@v2
with:
name: Toshi Binaries
path: bin
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
*.dll.*
*.lib
*.lib.*
*.exe.*

# User-specific files
*.rsuser
Expand Down
4 changes: 4 additions & 0 deletions OpenJPOG/Source/main.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
int main(int argc, char** argv)
{
return 1;
}
6 changes: 3 additions & 3 deletions OpenJPOG/premake5.lua
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ project ("OpenJPOG")

postbuildcommands
{
"{COPYDIR} Data \"%{wks.location}bin/" .. outputdir .. "/%{prj.name}/Data\"",
"{COPYDIR} \"" .. ClientContentCommon .. "\" \"%{wks.location}bin/" .. outputdir .. "/%{prj.name}/\"",
"{COPYDIR} \"" .. ClientContentArch .. "\" \"%{wks.location}bin/" .. outputdir .. "/%{prj.name}/\"",
--"{COPYDIR} Data \"%{wks.location}bin/" .. outputdir .. "/%{prj.name}/Data\"",
--"{COPYDIR} \"" .. ClientContentCommon .. "\" \"%{wks.location}bin/" .. outputdir .. "/%{prj.name}/\"",
--"{COPYDIR} \"" .. ClientContentArch .. "\" \"%{wks.location}bin/" .. outputdir .. "/%{prj.name}/\"",
}

filter "system:windows"
Expand Down
38 changes: 3 additions & 35 deletions Toshi/premake5.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,13 @@ project ("TKernelInterface")

links
{
"fmod_vc.lib",
"fmodstudio_vc.lib",
"fsbank_vc.lib",
"d3d11.lib",
"d3dcompiler.lib",
"dxguid.lib",
"dxgi.lib",
"winmm.lib",
"dinput8.lib",
"dbghelp.lib"
"winmm.lib"
}

includedirs
{
"Include",
"Include/TKernel",
"%{IncludeDir.fmod}",
"%{IncludeDir.stb}"
}

libdirs
{
"%{LibDir.fmod}"
}

defines
Expand Down Expand Up @@ -78,24 +62,13 @@ project ("TApplication")

links
{
"fmod_vc.lib",
"fmodstudio_vc.lib",
"fsbank_vc.lib",
"d3d11.lib",
"d3dcompiler.lib",
"dxguid.lib",
"dxgi.lib",
"winmm.lib",
"dinput8.lib",
"dbghelp.lib"
"winmm.lib"
}

includedirs
{
"Include",
"Include/TApplication",
"%{IncludeDir.fmod}",
"%{IncludeDir.stb}"
"Include/TApplication"
}

files
Expand All @@ -105,11 +78,6 @@ project ("TApplication")
"Source/TApplication/**.cpp"
}

libdirs
{
"%{LibDir.fmod}"
}

defines
{
"TOSHI_USER_ENGINE",
Expand Down

0 comments on commit e268445

Please sign in to comment.