Merge branch 'master' of https://github.com/vpinball/libdmdutil

vpinball · Jan 15, 2024 · a132267 · a132267
2 parents 8a4dc78 + 8b1dca4
commit a132267
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -131,7 +131,7 @@ if(BUILD_SHARED)
    install(TARGETS dmdutil_shared
       LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
    )
-   install(FILES src/DMDUtil.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
+   install(DIRECTORY include/DMDUtil DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
 
    if(PLATFORM STREQUAL "win" OR PLATFORM STREQUAL "macos" OR PLATFORM STREQUAL "linux")
       add_executable(dmdutil_test
@@ -194,7 +194,7 @@ if(BUILD_STATIC)
    install(TARGETS dmdutil_static
       LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
    )
-   install(FILES src/DMDUtil.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
+   install(DIRECTORY include/DMDUtil DESTINATION ${CMAKE_INSTALL_PREFIX}/include)
 
    if(PLATFORM STREQUAL "win" OR PLATFORM STREQUAL "macos" OR PLATFORM STREQUAL "linux")
       add_executable(dmdutil_test_s

diff --git a/include/DMDUtil/DMD.h b/include/DMDUtil/DMD.h
@@ -24,7 +24,7 @@ class ZeDMD;
 namespace DMDUtil {
 
 enum class AlphaNumericLayout {
-   None,
+   NoLayout,
    __2x16Alpha,
    __2x20Alpha,
    __2x7Alpha_2x7Num,
@@ -126,4 +126,4 @@ class DMDUTILAPI DMD
    static bool m_finding;
 };
 
-}
+}