Merge branch 'master' of skyjake.fi:skyjake/lagrange

1 files changed, 16 insertions, 9 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ab57900e..a5b41da3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,10 @@ project (Lagrange
 )
 set (COPYRIGHT_YEAR 2020)
 
+# Build configuration.
+option (ENABLE_KERNING "Enable kerning in font renderer (slower)" ON)
+option (ENABLE_RESOURCE_EMBED "Embed resources inside the executable" OFF)
+
 include (Embed.cmake)
 find_package (the_Foundation REQUIRED)
 find_package (PkgConfig REQUIRED)
@@ -15,11 +19,10 @@ pkg_check_modules (SDL2 REQUIRED sdl2)
 # Embedded resources are written to a generated source file.
 message (STATUS "Preparing embedded resources...")
 # Fonts are too large to comfortably embed as a C source.
-set (EMBED_IN_EXECUTABLE OFF CACHE BOOL "Embed resources inside the executable")
 set (EMBED_RESOURCES 
-    res/about.gmi
-    res/help.gmi
-    res/version.gmi
+    res/about/help.gmi
+    res/about/lagrange.gmi
+    res/about/version.gmi
     res/SourceSansPro-Regular.ttf
     res/FiraSans-Regular.ttf
     res/FiraSans-Bold.ttf
@@ -34,12 +37,12 @@ set (EMBED_RESOURCES
  endif ()
 embed_make (${EMBED_RESOURCES})
 
-set (EMB_BIN ${CMAKE_CURRENT_BINARY_DIR}/resources.bin)
+set (EMB_BIN ${CMAKE_CURRENT_BINARY_DIR}/resources.binary)
 set_source_files_properties (${EMB_BIN} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 
 # Source files.
 set (SOURCES
-    ${CMAKE_CURRENT_BINARY_DIR}/resources.bin
+    ${CMAKE_CURRENT_BINARY_DIR}/resources.binary
     ${CMAKE_CURRENT_BINARY_DIR}/embedded.c
     ${CMAKE_CURRENT_BINARY_DIR}/embedded.h
     src/main.c
@@ -92,7 +95,7 @@ set (SOURCES
 )
 if (IOS)
 elseif (APPLE)
-    list (APPEND SOURCES src/ui/macos.m src/ui/macos.h)
+    list (APPEND SOURCES src/macos.m src/macos.h)
     list (APPEND RESOURCES "res/Lagrange.icns")
 endif ()
 if (MSYS)
@@ -113,9 +116,13 @@ target_include_directories (app PUBLIC
 )
 target_compile_options (app PUBLIC
     -Werror=implicit-function-declaration
+    -Werror=incompatible-pointer-types
     ${SDL2_CFLAGS}
 )
 target_compile_definitions (app PUBLIC LAGRANGE_APP_VERSION="${PROJECT_VERSION}")
+if (ENABLE_KERNING)
+    target_compile_definitions (app PUBLIC LAGRANGE_ENABLE_KERNING=1)
+endif ()
 target_link_libraries (app PUBLIC the_Foundation::the_Foundation)
 target_link_libraries (app PUBLIC ${SDL2_LDFLAGS})
 if (APPLE)
@@ -145,7 +152,7 @@ endif ()
 # Deployment.
 if (MSYS)
     install (TARGETS app DESTINATION .)
-    if (NOT EMBED_IN_EXECUTABLE)
+    if (NOT ENABLE_RESOURCE_EMBED)
         install (FILES ${EMB_BIN} DESTINATION .)
     endif ()
     install (PROGRAMS 
@@ -172,7 +179,7 @@ Icon=fi.skyjake.lagrange")
          DESTINATION share/icons/hicolor/256x256/apps
          RENAME fi.skyjake.lagrange.png
     )
-    if (NOT EMBED_IN_EXECUTABLE)
+    if (NOT ENABLE_RESOURCE_EMBED)
         install (FILES ${EMB_BIN} DESTINATION share/lagrange)
     endif ()
 endif ()