Compare revisions

848bc0d9 · c030544b · d98f247c · 3e5b6b4a · c870f6d2 · 34cbdee0
--- a/.gitattributes
+++ b/.gitattributes
+*,ogg filter=lfs diff=lfs merge=lfs -text
+*.mtl filter=lfs diff=lfs merge=lfs -text
+*.jpg filter=lfs diff=lfs merge=lfs -text
+*.obj filter=lfs diff=lfs merge=lfs -text
+*.png filter=lfs diff=lfs merge=lfs -text
--- a/.gitignore
+++ b/.gitignore
-build/
+# build files
 builds/
-cmake-build-debug/
+cmake-build-*
-cmake-build-debug-coverage/
 imgui.ini
 .flatpak-builder/
 compile_commands.json
-# dotfiles
+# Engine data
+demo/data/*.bin
+# dotfiles (IDE)
 .idea/
 .cache/
+.venv/
-# windows vs stuff
+# windows visual studio
 .vs/
+out/
 CMakePresets.json
 CMakeSettings.json
\ No newline at end of file
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,51 +15,83 @@
 image: ${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/alpine:latest
-stages:          # List of stages for jobs, and their order of execution
+stages:
  - build
  - test
  - deploy
+variables:
+  GIT_SUBMODULE_STRATEGY: recursive
 .f34-ogl:
-  image: git.fossgalaxy.com:8042/gamedev/containers/fedora:34-opengl
+  image: git.fossgalaxy.com:8042/gamedev/containers/fedora:36-opengl
  before_script:
-    - dnf install -y pkgconfig\(dri\) pkgconfig\(glu\) pkgconfig\(x11\) pkgconfig\(xcursor\) pkgconfig\(xi\) pkgconfig\(xinerama\) pkgconfig\(xrandr\)
+    - dnf install -y pkgconfig\(dri\) pkgconfig\(glu\) pkgconfig\(x11\) pkgconfig\(xcursor\) pkgconfig\(xi\) pkgconfig\(xinerama\) pkgconfig\(xrandr\) pkgconfig\(lua\) doxygen
-    - dnf install -y libxcb-devel libfontenc-devel libXaw-devel libXcomposite-devel libXcursor-devel libXdmcp-devel libXft-devel libXtst-devel libXinerama-devel libxkbfile-devel libXrandr-devel libXres-devel libXScrnSaver-devel libXvMC-devel xorg-x11-xtrans-devel xcb-util-wm-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-renderutil-devel libXdamage-devel libXxf86vm-devel libXv-devel xkeyboard-config-devel xcb-util-devel libuuid-devel
+    - dnf install -y glm-devel glfw-devel openal-soft-devel spdlog-devel freetype-devel yaml-cpp-devel assimp-devel gtest-devel gmock-devel
-    - pip install conan
-build:f34-conan-xorg:
+##
+# Build Targets check it builds on popular Linux Distributions
+##
+build:fedora:
  extends: .f34-ogl
  stage: build
  script:
-    - cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug
+    - cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DFGGL_EXT_BULLET=OFF
    - cmake --build build
-    - camke --build build -t test
  artifacts:
    paths:
      - build/fggl/
-      - build/tests/
-test:f34-fallback-wayland:
+build:ubuntu:
-  extends: .f34-ogl
+  image: ubuntu:jammy
-  stage: test
+  stage: build
-  needs: [ "build:f34-conan-xorg" ]
+  before_script:
+    - apt update && apt install -y build-essential cmake
+    - apt install -y libglm-dev libglfw3-dev libopenal-dev libspdlog-dev libfreetype-dev libyaml-cpp-dev libassimp-dev libbullet-extras-dev libgtest-dev libgmock-dev liblua5.2-dev
  script:
-    - cd build && ./tests/testfggl/fggl_test
+    - cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug -DFGGL_EXT_BULLET=OFF -DFGGL_EXT_LUA=OFF
-  dependencies:
+    - cmake --build build
-    - build:f34-conan-xorg
-#unit-test-job:   # This job runs in the test stage.
-#  stage: test    # It only starts when the job in the build stage completes successfully.
-#  before_script:
-#    - apk update && apk --update add build-base g++ libstdc++ cmake extra-cmake-modules bash mesa-gl wayland-dev wayland-protocols
-#  script:
-#    - mkdir build && cd build
-#    - cmake .. && make # TODO cache build from previous step
-#    - ./tests/testfggl/fggl_test
-#lint-test-job:   # This job also runs in the test stage.
+# Based on Bruce Cowan's wordsearch package:
-#  stage: test    # It can run at the same time as unit-test-job (in parallel).
+flatpak:
-#  script:
+  image: alpine:latest
-#    - echo "Linting code... This will take about 10 seconds."
+  stage: deploy
-#    - sleep 10
+  when: manual
-#    - echo "No lint issues found."
+  only:
+    - develop
+  variables:
+    MANIFEST_PATH: "build-aux/com.fossgalaxy.fggl.demo.yml"
+    RUNTIME_REPO: "https://flathub.org/repo/flathub.flatpakrepo"
+    FLATPAK_MODULE: "fggl"
+    BUNDLE: "fggl-demo.flatpak"
+    APP_ID: "com.fossgalaxy.fggl.demo"
+  script:
+    - apk update && apk add flatpak-builder
+    - flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
+    - flatpak install -y flathub org.freedesktop.Platform 21.08
+    - flatpak install -y flathub org.freedesktop.Sdk 21.08
+    - flatpak-builder _repo ${MANIFEST_PATH}
+    - flatpak build-bundle _repo ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${APP_ID}
+  artifacts:
+    paths:
+      - ${BUNDLE}
+      - _build/meson-logs/meson-log.txt
+  cache:
+    paths:
+      - .flatpak-builder/cache
+      - .flatpak-builder/downloads
+# Deploy doxygen pages
+pages:
+  extends: .f34-ogl
+  stage: deploy
+  only:
+    - develop
+  script:
+    - cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug
+    - cmake --build build --target docs
+    - cp -r build/docs/html public
+  artifacts:
+     paths:
+       - public
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
 cmake_minimum_required(VERSION 3.16)
 set(namespace "fggl")
-set(CONAN_BUILD_TYPE "Debug")
+set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD_REQUIRED YES)
+option(FGGL_EXAMPLES "Should we build examples or just the library" ON)
+option(FGGL_TESTS "Should we enable the testing suite?" ON)
+option(FGGL_DOCS "Should we build documentation?" ON)
+option(FGGL_EXT_BULLET "Should we build the bullet module?" OFF)
+option(FGGL_EXT_LUA "Should we build the lua module?" ON)
+##
+# Windows
+# When on windows, integrate vcpkg
+##
+if(DEFINED ENV{VCPKG_ROOT} AND NOT DEFINED CMAKE_TOOLCHAIN_FILE)
+  set(CMAKE_TOOLCHAIN_FILE "$ENV{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+      CACHE STRING "")
+endif()
+##
+# /windows
+##
 # Define the project
 project(fggl
 	VERSION 0.1
-	DESCRIPTION ""
+	DESCRIPTION "FOSS Galaxy Game Library, for use in Education, and Games"
-	HOMEPAGE_URL ""
+	HOMEPAGE_URL "https://git.fossgalaxy.com/gamedev/fggl"
-	LANGUAGES CXX)
+	LANGUAGES C CXX)
-if (CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME)
+# export compile commands for vim/neovim users
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-	# slightly cleaner conan support
-	set(CMAKE_MODULE_PATH ${CMAKE_BINARY_DIR} ${CMAKE_MODULE_PATH})
+# vendor dependencies
-	set(CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR} ${CMAKE_PREFIX_PATH})
+add_subdirectory( vendor/entt )
-	include( cmake/conan.cmake )
+add_subdirectory( vendor/imgui )
+add_subdirectory( vendor/glad )
-	execute_process( COMMAND ls ${CMAKE_BINARY_DIR} )
+# engine headers
-	conan_cmake_configure(
+file(GLOB_RECURSE public_headers
-		REQUIRES
+	${PROJECT_SOURCE_DIR}/include/fggl/*.hpp
-			opengl/system
+)
-			glfw/3.3.7
-			glad/0.1.35
+# engine sources, enable strict compiler warnings
-			glm/0.9.9.8
+add_subdirectory( fggl )
-			spdlog/1.10.0
+target_compile_options( fggl PRIVATE -Wall -Wpedantic -Wextra -Wodr -fno-strict-aliasing -fno-strict-overflow )
-		GENERATORS 
+set_property(TARGET fggl PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
-			cmake_find_package_multi
-		OPTIONS
+# Unit Tests
-			glad:gl_profile=core
+if (FGGL_TESTS)
-			glad:gl_version=4.5
-			glad:extensions="GL_ARB_get_program_binary"
-	)
-	foreach(TYPE ${CMAKE_CONFIGURATION_TYPES})
-		conan_cmake_autodetect( settings BUILD_TYPE ${TYPE} )
-		conan_cmake_install(
-			PATH_OR_REFERENCE .
-			BUILD missing
-			REMOTE connancenter
-			SETTINGS ${settings}
-		)
-	endforeach()
-	execute_process( COMMAND ls ${CMAKE_BINARY_DIR} )
-	# testing support
 	include(CTest)
+	add_subdirectory(tests)
+endif()
-	# Documentation support
+# Documentation support
+if (FGGL_DOCS)
 	find_package(Doxygen)
 	if (Doxygen_FOUND)
 		add_subdirectory( docs )
 	else()
 		message(STATUS "Doxygen not found, not building docs")
 	endif()
 endif()
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-##
-# begin windows support
 ##
-if(MSVC)
+# Optional/Extra modules
-  target_compile_options(${PROJECT_NAME} PUBLIC "/ZI")
-  target_link_options(${PROJECT_NAME} PUBLIC "/INCREMENTAL")
-endif()
-##
-# end windows support
 ##
-set(FGGL_WAYLAND True)
+# 3rd party integrations
+if ( FGGL_EXT_BULLET )
+	add_subdirectory( integrations/bullet )
-include(GNUInstallDirs)
+endif()
-# depedencies
+if ( FGGL_EXT_LUA )
+	add_subdirectory( integrations/lua )
+endif()
-# engine
+# Tools
-#add_subdirectory(vendor/imgui/)
+# add_subdirectory( tools/pack )
-add_subdirectory(fggl)
-# extras
+# Demo project
-#add_subdirectory(tests)
+if (FGGL_EXAMPLES)
-add_subdirectory(demo)
+	add_subdirectory(demo EXCLUDE_FROM_ALL)
+endif()
 ##
 # INSTALL PHASE
 # see https://decovar.dev/blog/2021/03/08/cmake-cpp-library/
 ##
-file(GLOB_RECURSE public_headers
+include(GNUInstallDirs)
-	${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}/*.hpp
-	${PROJECT_SOURCE_DIR}/include/${PROJECT_NAME}/*.h
-)
-#include(CMakePrintHelpers)
 # Structure preserving header macro
 foreach(header ${public_headers})
@@ -112,40 +103,42 @@ endforeach()
 set_target_properties(${PROJECT_NAME} PROPERTIES DEBUG_POSTFIX "d")
+include(CMakePackageConfigHelpers)
+set(FGGL_CONFIG_PATH "${CMAKE_INSTALL_LIBDIR}/cmake/fggl")
 # generate and install export file
 install(EXPORT "${PROJECT_NAME}Targets"
-    FILE "${PROJECT_NAME}Targets.cmake"
+	    FILE "${PROJECT_NAME}Targets.cmake"
-    NAMESPACE ${namespace}::
+	    NAMESPACE ${namespace}::
-    DESTINATION cmake
+	    DESTINATION "${FGGL_CONFIG_PATH}"
 )
-include(CMakePackageConfigHelpers)
 # generate the version file for the config file
 write_basic_package_version_file(
    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
    VERSION "${version}"
    COMPATIBILITY AnyNewerVersion
 )
-# create config file
 configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
-    INSTALL_DESTINATION cmake
+    INSTALL_DESTINATION "${FGGL_CONFIG_PATH}"
 )
 # install config files
 install(FILES
    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
    "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
-    DESTINATION cmake
+    DESTINATION "${FGGL_CONFIG_PATH}"
 )
 # generate the export targets for the build tree
+install(TARGETS ${PROJECT_NAME}
+		EXPORT fgglTargets
+			DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+		PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
+		INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
 export(EXPORT "${PROJECT_NAME}Targets"
-    FILE "${CMAKE_CURRENT_BINARY_DIR}/cmake/${PROJECT_NAME}Targets.cmake"
+    FILE "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake"
    NAMESPACE ${namespace}::
 )
-install(TARGETS ${PROJECT_NAME}
-  EXPORT ${PROJECT_NAME}Targets
-  PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}
-  INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-)
--- a/Config.cmake.in
+++ b/Config.cmake.in
 @PACKAGE_INIT@
+include(CMakeFindDependencyMacro)
+find_dependency(glm)
+find_dependency(fmt)
+find_dependency(Lua)
+find_dependency(spdlog)
+find_dependency(Freetype)
+find_dependency(OpenAL CONFIG)
+find_dependency(OpenGL)
 include("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake")
 check_required_components(@PROJECT_NAME@)
\ No newline at end of file
--- a/README.md
+++ b/README.md
@@ -4,14 +4,25 @@ A library for building FOSS Games, Educational Resources and Academic Experiment
 ## Development Instructions
+### Installing dependenecies
+FGGL depends on a few dependencies to work correctly.
+On Ubuntu:
+```bash
+sudo apt install build-essential cmake
+sudo apt install -y libglm-dev libglfw3-dev libopenal-dev libspdlog-dev libfreetype-dev libyaml-cpp-dev libassimp-dev libbullet-dev
+```
+On Fedora:
+```bash
+sudo dnf install -y glm-devel glfw-devel openal-soft-devel spdlog-devel freetype-devel yaml-cpp-devel assimp-devel bullet-devel gcc gcc-c++ cmake gtest-devel doxygen lua lua-devel gmock gmock-devel
+```
 ### Building
 It's designed to be a fairly standard cmake project, so the standard cmake steps should work:
 ```bash
-mkdir build
+cmake -S . -B build -DCMAKE_BUILD_TYPE=Debug
-cd build
+cmake --build build
-cmake ..
-make
 ```
 The library should also build the test scene (`demo`). There is a shellscript in the root of the
@@ -20,7 +31,34 @@ project that will build the project and run the demo project in gdb.
 Most of the dependencies should be downloaded automatically. If you're on X don't use glfw from the
 Fedora repos, it won't work (it's configured for Wayland). The version the project builds should work.
-### Useful Tools
+### Deploying
+The library is designed to be used as a shared library, as it is licenced in the LGPL. You can generate the shared library, header files and assoicated cmake files using the following command:
+```bash
+cmake --install build --prefix /tmp/fggl-lib
+```
+This will place the files in /tmp/fggl-lib, you can adjust this to suit your needs.
+You can then include the library in your application using cmake, eg:
+```bash
+find_package(spdlog REQUIRED)
+target_link_libraries(game spdlog::spdlog)
+find_package( fggl REQUIRED PATHS /tmp/fggl-lib )
+target_link_libraries(game fggl::fggl)
+```
+### Flatpak Demo
+This is still experimental, but the command used to test flatpak compatablity with the demo application is:
+```
+flatpak-builder builds/flatpak build-aux/com.fossgalaxy.fggl.demo.yml --force-clean --install --user
+```
+## Useful Tools
 The following tools are helpful for development:
 * Valgrind (see the ways in which memory is messed up)

--- a/build-aux/com.fossgalaxy.fggl.demo.yml
+++ b/build-aux/com.fossgalaxy.fggl.demo.yml
-app-id: com.fossgalaxy.fggl.demo
+app-id: com.fossgalaxy.fggl.Demo
-runtime: org.freedesktop.Platform.GL.default
+runtime: org.freedesktop.Platform
 runtime-version: '21.08'
 sdk: org.freedesktop.Sdk
-command: fggl-demo
+command: /app/bin/demo
+finish-args:
+  - "--device=dri"
+  - "--share=ipc"
+  - "--socket=fallback-x11"
+  - "--socket=wayland"
 modules:
-  - name: glfw
+  - modules/glfw.yml
-    buildsystem: cmake-ninja
-    builddir: true
-    sources:
-      - type: archive
-        url: https://github.com/glfw/glfw/releases/download/3.3.4/glfw-3.3.4.zip
-        sha256: bbd2c42c660b725e9755eb417e40b373f0d4c03138c9b2e210d02cd308bd99cd
-    cleanup:
-      - /include
-      - /lib/pkgconfig
  - modules/glm-0.9.9.8.json
-  - shared-modules/glew/glew.json
+  - modules/fmt.yml
-  - shared-modules/glu/glu-9.json
+  - modules/spdlog.json
  - modules/googletest.yml
+  - shared-modules/glu/glu-9.json
+  - modules/yaml-cpp.yml
+  - modules/assimp.yml
  - name: fggl
    buildsystem: cmake
+    builddir: true
    sources:
      - type: dir
        path: ../
+    cleanup:
+      - '/include'
+      - '/cmake'
+      - '*.a'
--- a/build-aux/fggl.spec
+++ b/build-aux/fggl.spec
+Name: fggl
+Version: 0.1.0
+Release: 1%{?dist}
+Summary: FOSS Galaxy game library
+License: LGPLv3
+# The source was pulled from github
+source0: https://git.fossgalaxy.com/gamedev/fggl/-/archive/develop/fggl-develop.zip
+BuildRequires: g++
+BuildRequires: cmake
+BuildRequires: glfw-devel
+BuildRequires: openal-devel
+BuildRequires: glm-devel
+BuildRequires: glfw-devel
+BuildRequires: openal-soft-devel
+BuildRequires: spdlog-devel
+BuildRequires: freetype-devel
+BuildRequires: yaml-cpp-devel
+BuildRequires: assimp-devel
+BuildRequires: bullet-devel
+BuildRequires: gtest-devel
+BuildRequires: gmock-devel
+# demo desktop stuff
+BuildRequires: libappstream-glib
+BuildRequires: desktop-file-utils
+%description
+%{summary}.
+%prep
+%setup -q -n %{name}-develop
+%build
+%cmake
+%cmake_build
+%install
+%cmake_install
+%check
+%ctest
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml
+desktop-file-validate %{buildroot}/%{_datadir}/applications/com.fossgalaxy.fggl.Demo.desktop
+%package demos
+Summary: Demos for fggl
+Group: System Environment/Libraries
+Requires: %{name} = %{version}-%{release}
+%description demos
+FGGL example binaries
+%package devel
+Summary: FGGL development libraries and header files
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+%description devel
+fggl dynamic libraries and header files.
+%files
+%{_libdir}/libfggl.so
+%files devel
+%{_includedir}/fggl/*
+%{_libdir}/cmake/%{name}
+# this feels like a packaging bug...
+%{_libdir}/libimgui.a
+%files demos
+%{_bindir}/demo
+%{_datadir}/fggl-demo/*
+%{_datadir}/applications/com.fossgalaxy.fggl.Demo.desktop
+%{_metainfodir}/com.fossgalaxy.fggl.Demo.metainfo.xml
--- a/build-aux/modules/assimp.yml
+++ b/build-aux/modules/assimp.yml
+name: assimp
+buildsystem: cmake
+config-opts:
+  - -DASSIMP_BUILD_ASSIMP_TOOLS=OFF
+  - -DASSIMP_BUILD_TESTS=OFF
+sources:
+  - type: git
+    url: https://github.com/assimp/assimp.git
+    tag: v5.2.4
+cleanup:
+  - '/include'
+  - '/lib/cmake'
+  - '/lib/pkgconfig'
--- a/build-aux/modules/fmt.yml
+++ b/build-aux/modules/fmt.yml
+name: fmt
+buildsystem: cmake
+sources:
+  - type: git
+    url: https://github.com/fmtlib/fmt.git
+    tag: 8.1.1
+cleanup:
+  - '/include'
+  - '/lib/cmake'
+  - '/lib/pkgconfig'
+  - '*.a'
--- a/build-aux/modules/glfw.yml
+++ b/build-aux/modules/glfw.yml
+name: glfw
+buildsystem: cmake-ninja
+builddir: true
+sources:
+  - type: archive
+    url: https://github.com/glfw/glfw/releases/download/3.3.4/glfw-3.3.4.zip
+    sha256: bbd2c42c660b725e9755eb417e40b373f0d4c03138c9b2e210d02cd308bd99cd
+cleanup:
+  - /include
+  - /lib/cmake
+  - /lib/pkgconfig
+  - '*.a'
--- a/build-aux/modules/googletest.yml
+++ b/build-aux/modules/googletest.yml
@@ -4,3 +4,8 @@ sources:
  - type: archive
    url: https://github.com/google/googletest/archive/refs/tags/release-1.11.0.zip
    sha256: 353571c2440176ded91c2de6d6cd88ddd41401d14692ec1f99e35d013feda55a
+cleanup:
+  - '/include'
+  - '/lib/cmake'
+  - '/lib/pkgconfig'
+  - '*.a'
--- a/build-aux/modules/spdlog.json
+++ b/build-aux/modules/spdlog.json
+{
+    "name": "spdlog",
+    "buildsystem": "cmake",
+    "sources": [
+        {
+            "type": "git",
+            "url": "https://github.com/gabime/spdlog.git",
+            "tag": "v1.10.0"
+        }
+    ],
+    "cleanup": [
+        "/include",
+        "/lib/cmake",
+        "/lib/pkgconfig",
+        "*.a"
+    ]
+}
--- a/build-aux/modules/yaml-cpp.yml
+++ b/build-aux/modules/yaml-cpp.yml
+name: yaml-cpp
+buildsystem: cmake
+config-opts:
+  - -DYAML_CPP_BUILD_TESTS=off
+sources:
+  - type: git
+    url: https://github.com/jbeder/yaml-cpp.git
+    tag: yaml-cpp-0.7.0
+cleanup:
+  - '/include'
+  - '/share/cmake'
+  - '/share/pkgconfig'
+  - '*.a'
--- a/shared-modules @ 1bb53934
+++ b/shared-modules @ 1bb53934
-Subproject commit 0534d3276b3966e87abacd163f757454b6fcf724
+Subproject commit 1bb53934f105743f84f923693847185dce613cef
--- a/build.sh
+++ b/build.sh
@@ -2,13 +2,9 @@
 CACHE=/tmp/fggl/
 LOG=$CACHE/demo.log
-EXE="../builds/cli/bin/FgglDemo"
-# check build directory exists
+BUILD_PATH="builds/cli"
-if [[ ! -d "builds/cli/" ]]
+DEMO_EXE="$PWD/$BUILD_PATH/demo/demo"
-then
-	mkdir -p builds/cli
-fi
 # check cmake exists
 if [ ! -x "$(command -v cmake)" ]; then
@@ -18,43 +14,32 @@ if [ ! -x "$(command -v cmake)" ]; then
 fi
 # if doing shader development, disable the cache to make sure changes take affect
+rm -rf builds/cli
 rm -rf $CACHE
 #
 # build step
 #
-pushd builds/cli
+cmake -S . -B $BUILD_PATH -DCMAKE_BUILD_TYPE=RelWithDebInfo
-cmake ../..
+cmake --build $BUILD_PATH
-if [ $? -ne 0 ]
+cmake --install $BUILD_PATH --prefix /tmp/fggl-lib
-then
-    echo "[!] Cmake failed"
-    exit 1
-fi
-make
-if [ $? -ne 0 ]
-then
-    echo "[!] make failed"
-    exit 1
-fi
-popd
 #
 # additional stuff
 #
-EXE="gdb $EXE"
+#EXE="gdb $EXE"
 # gamemoderun
 if [ -x "$(command -v gamemoderun)" ]; then
-	EXE="gamemoderun $EXE"
+    DEMO_EXE="gamemoderun $DEMO_EXE"
 fi
 # mangohud
 if [ -x "$(command -v mangohud)" ]; then
-	EXE="mangohud --dlsym $EXE"
+    DEMO_EXE="mangohud --dlsym $DEMO_EXE"
 fi
 pushd demo
-$EXE
+$DEMO_EXE
 popd
--- a/cmake/conan.cmake
+++ b/cmake/conan.cmake
--- a/demo/CMakeLists.txt
+++ b/demo/CMakeLists.txt
+cmake_minimum_required(VERSION 3.16)
+project(demo)
 # Executable
-add_executable(FgglDemo main.cpp)
+add_executable(demo
-target_link_libraries(FgglDemo fggl)
+        demo/main.cpp
-target_include_directories(FgglDemo PUBLIC ${PROJECT_BINARY_DIR})
+        demo/GameScene.cpp
+        demo/rollball.cpp
+        demo/topdown.cpp
+        demo/grid.cpp
+        demo/robot/programmer.cpp
+        demo/models/viewer.cpp
+        demo/hexboard/board.cpp
+        demo/hexboard/camera.cpp
+)
+# set build flags
+target_compile_options( demo PRIVATE -Wall -Wextra -Wodr -Wdouble-promotion -fno-strict-aliasing -fno-strict-overflow )
+set_property(TARGET demo PROPERTY INTERPROCEDURAL_OPTIMIZATION True)
+target_include_directories(demo
+        PRIVATE
+            ${CMAKE_CURRENT_SOURCE_DIR}/include
+)
+target_link_libraries( demo fggl )
+#target_link_libraries(demo fggl fgglbt)
+if ( FGGL_EXT_LUA )
+    target_link_libraries( demo fggl-lua )
+endif()
-# rssources
+find_package(spdlog)
+target_link_libraries(demo spdlog::spdlog)
+#target_include_directories(FgglDemo PUBLIC ${PROJECT_BINARY_DIR})
+#find_package(Lua)
+#target_link_libraries(demo ${LUA_LIBRARIES})
+# resources
 file(GLOB_RECURSE data data/*)
 file(COPY ${data} DESTINATION data )
+include(GNUInstallDirs)
+install(
+        TARGETS demo
+        RUNTIME
+        DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
+install(
+        DIRECTORY data/
+        DESTINATION ${CMAKE_INSTALL_DATADIR}/fggl-demo
+)
+# Linux Desktop Entries
+if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    install(FILES aux/com.fossgalaxy.fggl.Demo.desktop DESTINATION ${CMAKE_INSTALL_DATADIR}/applications )
+    install(FILES aux/com.fossgalaxy.fggl.Demo.metainfo.xml DESTINATION ${CMAKE_INSTALL_DATADIR}/metainfo )
+endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
--- a/demo/aux/com.fossgalaxy.fggl.Demo.desktop
+++ b/demo/aux/com.fossgalaxy.fggl.Demo.desktop
+[Desktop Entry]
+Name=FGGL Demo
+Exec=demo
+Type=Application
+Categories=Game
--- a/demo/aux/com.fossgalaxy.fggl.Demo.metainfo.xml
+++ b/demo/aux/com.fossgalaxy.fggl.Demo.metainfo.xml
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+  <id>com.fossgalaxy.fggl.Demo</id>
+  <name>FGGL Demo</name>
+  <summary>An application for testing FGGL features</summary>
+  <metadata_license>CC-BY-4.0</metadata_license>
+  <project_license>GPL-3.0-or-later</project_license>
+  <description>
+    <p>
+      Test application for the FOSS Galaxy Game Library (FGGL)
+    </p>
+  </description>
+  <launchable type="desktop-id">com.fossgalaxy.fggl.Demo.desktop</launchable>
+</component>
No results found