From c7611b4fcc0dfa2497fcdb75f71defdef6be6a2a Mon Sep 17 00:00:00 2001 From: Rodrigo Mesquita Date: Sat, 4 May 2024 17:25:50 +0100 Subject: [PATCH] More FS organization --- Makefile | 6 ---- .../mods_at_some_other_point.svg | 0 .../architecture}/mods_at_some_point.svg | 0 ghengin/ghengin.cabal | 32 +++++++++---------- .../DISTRIBUTING.md | 0 5 files changed, 16 insertions(+), 22 deletions(-) delete mode 100644 Makefile rename {images => doc/architecture}/mods_at_some_other_point.svg (100%) rename {images => doc/architecture}/mods_at_some_point.svg (100%) rename DISTRIBUTING.md => packaging-macos/DISTRIBUTING.md (100%) diff --git a/Makefile b/Makefile deleted file mode 100644 index d397316..0000000 --- a/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -.PHONY: tags report -tags: - fast-tags -Rv ghengin-vulkan/ ghengin-core/ ghengin-core-indep/ linear-utils/ ghengin-games - -report: - hlint ghengin/ ghengin-vulkan/ ghengin-core/ ghengin-core-indep/ linear-utils/ --report || true diff --git a/images/mods_at_some_other_point.svg b/doc/architecture/mods_at_some_other_point.svg similarity index 100% rename from images/mods_at_some_other_point.svg rename to doc/architecture/mods_at_some_other_point.svg diff --git a/images/mods_at_some_point.svg b/doc/architecture/mods_at_some_point.svg similarity index 100% rename from images/mods_at_some_point.svg rename to doc/architecture/mods_at_some_point.svg diff --git a/ghengin/ghengin.cabal b/ghengin/ghengin.cabal index bf48c52..9060e88 100644 --- a/ghengin/ghengin.cabal +++ b/ghengin/ghengin.cabal @@ -5,7 +5,7 @@ name: ghengin -- | | | +--- code changes with no API change version: 0.1.0.0 -tested-with: GHC ==9.4.4 || ==9.6.1 +-- tested-with: GHC ==9.4.4 || ==9.6.1 -- synopsis: -- description: license: BSD-3-Clause @@ -16,9 +16,9 @@ maintainer: rodrigo.m.mesquita@gmail.com category: Graphics build-type: Simple extra-doc-files: ../CHANGELOG.md -extra-source-files: - cbits/imgui_extensions/*.cpp - cbits/imgui_extensions/*.hpp +-- extra-source-files: +-- cbits/imgui_extensions/*.cpp +-- cbits/imgui_extensions/*.hpp flag dev default: True @@ -35,7 +35,7 @@ common common-flags -- Debugging symbols -------------------- - -- -g2 + -- -g3 -- Linting ---------- @@ -92,12 +92,6 @@ common common-flags default-language: GHC2021 --------------------------------------------------------------------------------- --- when backpack with HLS with multi-libs cabal is fixed, move library stanzas --- from ghengin-core/ghengin-core.cabal and ghengin-vulkan/ghengin-vulkan.cabal --- and the some of the other (all?) packages listed in cabal.project to here --------------------------------------------------------------------------------- - library -- Import common warning flags. import: common-flags @@ -155,13 +149,10 @@ library -- other-modules: -- cbits - include-dirs: cbits/imgui_extensions + -- include-dirs: cbits/imgui_extensions cxx-options: -std=c++11 - cxx-sources: cbits/imgui_extensions/imgui_color_gradient.cpp + -- cxx-sources: cbits/imgui_extensions/imgui_color_gradient.cpp -- extra-libraries: stdc++ - include-dirs: cbits/imgui_extensions/ - if os(darwin) - ghc-options: -optcxx-std=c++11 if flag(dev) cpp-options: -DDEVELOPMENT @@ -220,6 +211,15 @@ library -- Directories containing source files. hs-source-dirs: ghengin +-------------------------------------------------------------------------------- +-- Sub-libraries for engine components +-------------------------------------------------------------------------------- + + + +-------------------------------------------------------------------------------- +-- Testsuites and old examples +-------------------------------------------------------------------------------- test-suite ghengin-test -- Import common warning flags. diff --git a/DISTRIBUTING.md b/packaging-macos/DISTRIBUTING.md similarity index 100% rename from DISTRIBUTING.md rename to packaging-macos/DISTRIBUTING.md