Merge pull request #18 from drojaazu/dev

Updated paths to gfxdefs to corrent installation bug and documentatio…

Author: drojaazu

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.23)
-project(chrgfx)
+project(chrgfx VERSION 3.0.1)
 
 set(PROJECT_CONTACT "Damian R (damian@motoi.pro)")
 set(PROJECT_WEBSITE "https://github.com/drojaazu")
@@ -47,7 +47,7 @@ if(NOT NO_UTILS)
   add_subdirectory(app/palview)
 endif()
 
-install(FILES share/gfxdef/gfxdefs
+install(FILES share/gfxdefs
   DESTINATION ${CMAKE_INSTALL_DATADIR}/chrgfx)
 
 #set(CMAKE_VERBOSE_MAKEFILE true)

README.md

@@ -47,7 +47,7 @@ The chrgfx library has a number of common, generic definitions included. Please
 
 External graphics definitions are stored in the `gfxdefs` file. The project comes with a number of definitions for many common hardware systems already created in this file.
 
-Please [see the readme in the gfxdef directory](share/gfxdef/README.md) and [the gfxdefs file itself](share/gfxdef/gfxdefs) for more details on the format.
+Please [see the readme in the gfxdef directory](share/README.md) and [the gfxdefs file itself](share/gfxdefs) for more details on the format.
 
 ### CLI Definitions
 
@@ -103,7 +103,7 @@ Specify hardware profile to use
 
 These arguments specify the tile, color and palette encoding, respectively. They are only required if a graphics profile was not specified. If they are used in conjunction with a graphics profile, they will override that particular encoding. (For example, using `--chr-def` will override the tile encoding that was specified in the profile.)
 
-Please [see the readme in the gfxdef directory](share/gfxdef/README.md) for more information about values represent in a gfxdef.
+Please [see the readme in the gfxdef directory](share/README.md) for more information about values represent in a gfxdef.
 
 The following options are used to build or modify a gfxdef:
 
@@ -123,7 +123,7 @@ Specify the bits per pixel (BPP) of a tile
 
 Specify the offset (in bits) to the start of each plane within a pixel.
 
-This is written as either a comma-delimted list of values, or as a range in the format of [start:count:step]. Please [see the readme in the gfxdef directory](share/gfxdef/README.md) for more about this option and list/range formatting.
+This is written as either a comma-delimted list of values, or as a range in the format of [start:count:step]. Please [see the readme in the gfxdef directory](share/README.md) for more about this option and list/range formatting.
 
 The number of entries should match the bits per pixel value for the tile.
 

app/shared/cfgload.hpp

@@ -13,6 +13,7 @@
 #define __MOTOI__CFGLOAD_HPP
 
 #include "lineread.hpp"
+#include <cstdint>
 #include <map>
 #include <stdexcept>
 #include <string>

lib/chrgfx/CMakeLists.txt

@@ -23,7 +23,6 @@ PUBLIC
   FILE_SET headers
   TYPE HEADERS
   FILES
-    image.hpp
     builtin_defs.hpp
     chrconv.hpp
     chrdef.hpp
@@ -33,7 +32,10 @@ PUBLIC
     custom.hpp
     filesys.hpp
     gfxdef.hpp
+    image.hpp
+    image_types.hpp
     imageformat_png.hpp
+    imaging.hpp
     palconv.hpp
     paldef.hpp
     rgb_layout.hpp  

lib/chrgfx/chrgfx.hpp

@@ -16,6 +16,7 @@
 #include "custom.hpp"
 #include "gfxdef.hpp"
 #include "image.hpp"
+#include "image_types.hpp"
 #include "imageformat_png.hpp"
 #include "imaging.hpp"
 #include "palconv.hpp"

lib/chrgfx/coldef.hpp

@@ -11,6 +11,7 @@
 #include "gfxdef.hpp"
 #include "image_types.hpp"
 #include "rgb_layout.hpp"
+#include "types.hpp"
 #include <vector>
 
 namespace chrgfx