From f74095c81f2aadfe824583114caf56df49e1ac12 Mon Sep 17 00:00:00 2001 From: "Christopher A. Mosher" Date: Tue, 1 Nov 2022 21:22:54 -0400 Subject: [PATCH] cmake build app conf --- .github/workflows/build.yaml | 27 +++++++++++++++++++++++++++ CMakeLists.txt | 5 ----- src/CMakeLists.txt | 4 ---- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 07b6561..d8f19d6 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -14,6 +14,10 @@ jobs: sudo apt-get update -qqqq sudo apt-get upgrade -qqqq sudo apt-get install -qqqq xa65 + m4 --version + xa --version + ldo65 --version + reloc65 --version - uses: "actions/checkout@v3" @@ -28,3 +32,26 @@ jobs: with: name: "epple2-roms" path: "./rom/*.a65" + + + + "build-epple2-ubuntu": + runs-on: "ubuntu-latest" + steps: + - name: "Prepare runner" + run: | + set -x + sudo apt-get update -qqqq + sudo apt-get upgrade -qqqq + sudo apt-get install -qqqq libsdl2-dev + + - uses: "actions/checkout@v3" + + - name: "Build" + run: | + set -x + mkdir build + cd build + cmake .. + cmake --build . + ls -l src conf diff --git a/CMakeLists.txt b/CMakeLists.txt index 345e66d..e409db3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,11 +1,6 @@ cmake_minimum_required(VERSION 3.22.1) - set(CMAKE_VERBOSE_MAKEFILE ON) - project(epple2) - include(GNUInstallDirs) - add_subdirectory(src) add_subdirectory(conf) -#add_subdirectory(rom) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b18b3c2..9c0247e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -72,10 +72,6 @@ wozfile.cpp ) add_executable(epple2 ${sources}) - target_compile_features(epple2 PUBLIC cxx_std_17) - -include(GNUInstallDirs) target_compile_definitions(epple2 PUBLIC ETCDIR="${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_SYSCONFDIR}") - target_link_libraries(epple2 ${SDL2_LIBRARIES})