Skip to content

Commit

Permalink
Merge pull request #23 from wdigger/cmake
Browse files Browse the repository at this point in the history
Changed: CMake used for project build
  • Loading branch information
wdigger authored Jun 11, 2024
2 parents 61d7755 + 9246d1c commit e2fd5f4
Show file tree
Hide file tree
Showing 34 changed files with 615 additions and 590 deletions.
48 changes: 48 additions & 0 deletions .github/workflows/linux.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
name: linux

on:
pull_request:
push:
release:
types: published

jobs:
build:
runs-on: ubuntu-22.04

strategy:
matrix:
buildtype: [Debug, Release]

steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: 'recursive'

- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install -y libglx-dev libgl1-mesa-dev
sudo apt-get install -y qt6-base-dev
sudo apt-get install -y libqt6opengl6-dev
- name: Configure FSStudio
run: |
cmake -B build -G "Unix Makefiles"
- name: Build FSStudio
run: |
cd build
make
- name: Pack FSStudio
run: |
cd build
make package
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: FSStudio-${{ matrix.buildtype }}
path: ./build/FSStudio-0.1.0-Linux.tar.*
45 changes: 45 additions & 0 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: macos

on:
pull_request:
push:
release:
types: published

jobs:
build:
runs-on: macos-latest

strategy:
matrix:
buildtype: [Debug, Release]

steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: 'recursive'

- name: Install dependencies
run: |
brew install qt6
- name: Configure FSStudio
run: |
cmake -B build -G "Unix Makefiles"
- name: Build FSStudio
run: |
cd build
make
- name: Pack FSStudio
run: |
cd build
make package
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: FSStudio-${{ matrix.buildtype }}
path: ./build/FSStudio.dmg
7 changes: 7 additions & 0 deletions .github/workflows/vcpkg.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "fsstudio",
"version-string": "0.1.0",
"dependencies": [
"qtbase"
]
}
58 changes: 58 additions & 0 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
name: windows

on:
pull_request:
push:
release:
types: published

jobs:
build:
runs-on: windows-latest

strategy:
matrix:
buildtype: [Debug, Release]
architecture: [x64]

steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: 'recursive'

- name: Setup environment
uses: ilammy/msvc-dev-cmd@v1
with:
arch: ${{ matrix.architecture }}

- name: Install dependencies
uses: jurplel/install-qt-action@v4
with:
version: '6.2.0'
host: 'windows'
target: 'desktop'
arch: "win64_msvc2019_64"
cache: true

- name: Configure FSStudio
run: |
cmake -B build -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=${{ matrix.buildtype }}
- name: Build FSStudio
shell: bash
run: |
cd build
nmake
- name: Pack FSStudio
shell: bash
run: |
cd build
nmake package
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: FSStudio-${{ matrix.architecture }}-${{ matrix.buildtype }}
path: ./build/FSStudio-${{ matrix.architecture }}-${{ matrix.buildtype }}.exe
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ Makefile*
debug
release
.qmake.stash
.DS_Store
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "freeserf"]
path = freeserf
url = git://github.com/freeserf/freeserf
url = https://github.com/freeserf/freeserf.git
35 changes: 0 additions & 35 deletions .travis.yml

This file was deleted.

47 changes: 47 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
cmake_minimum_required(VERSION 3.16)

project(FSStudio VERSION 0.1.0 LANGUAGES CXX)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)

set(CMAKE_OSX_DEPLOYMENT_TARGET 12.0)

set(CMAKE_INCLUDE_CURRENT_DIR ON)
include_directories(${INCLUDE_DIRECTORIES} ${CMAKE_CURRENT_SOURCE_DIR} freeserf)

set(FREESERF_DATA_SOURCES ./freeserf/src/data.cc
./freeserf/src/data-source-dos.cc
./freeserf/src/data-source-amiga.cc
./freeserf/src/data-source-custom.cc
./freeserf/src/data-source-legacy.cc
./freeserf/src/tpwm.cc
./freeserf/src/sfx2wav.cc
./freeserf/src/xmi2mid.cc
./freeserf/src/data-source.cc
./freeserf/src/log.cc
./freeserf/src/configfile.cc
./freeserf/src/buffer.cc
./freeserf/src/pcm2wav.cc
./freeserf/src/debug.cc)

set(FREESERF_DATA_HEADERS ./freeserf/src/data.h
./freeserf/src/misc.h
./freeserf/src/freeserf_endian.h
./freeserf/src/data-source-dos.h
./freeserf/src/data-source-amiga.h
./freeserf/src/data-source-custom.h
./freeserf/src/data-source-legacy.h
./freeserf/src/tpwm.h
./freeserf/src/sfx2wav.h
./freeserf/src/xmi2mid.h
./freeserf/src/data-source.h
./freeserf/src/log.h
./freeserf/src/configfile.h
./freeserf/src/buffer.h
./freeserf/src/pcm2wav.h
./freeserf/src/debug.h)

add_library(freeserf_data STATIC ${FREESERF_DATA_SOURCES} ${FREESERF_DATA_HEADERS})

add_subdirectory(src)
46 changes: 0 additions & 46 deletions appveyor.yml

This file was deleted.

93 changes: 0 additions & 93 deletions fsstudio.pro

This file was deleted.

Loading

0 comments on commit e2fd5f4

Please sign in to comment.