small improvements in builds setup

- use automake's way of defining dirs instead of doing it manually
- fixed a bug where NDEBUG was set for debug builds, instead of the
  inverse
- expanded tabs into space in configure.ac

2 files changed, 70 insertions, 56 deletions

diff --git a/Makefile.am b/Makefile.am
index a503ed8..1930529 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,19 +9,26 @@ if DEBUG
 ASSETS_DIR_CPP = $(srcdir)/assets
 ASSETS_OBJS_DIR_CPP = $(srcdir)/assets/objs
 ASSETS_TEXTURES_DIR_CPP = $(srcdir)/assets/textures
-SHADERS_DIR_CPP = $(builddir)/src/shaders
+SHADERS_DIR_CPP = $(builddir)
 else
 ASSETS_DIR_CPP = assets
 ASSETS_OBJS_DIR_CPP = assets/objs
 ASSETS_TEXTURES_DIR_CPP = assets/textures
-SHADERS_DIR_CPP = src/shaders
+SHADERS_DIR_CPP = shaders
 endif
 
 enginedir = $(datarootdir)/engine
-nobase_engine_DATA = \
-	assets/objs/suzanne.obj assets/textures/texture.jpg \
-	assets/objs/viking_room.obj assets/textures/viking_room.png
-EXTRA_DIST += $(nobase_engine_DATA)
+assetsdir = $(enginedir)/assets
+assets_objsdir = $(assetsdir)/objs
+assets_texturesdir = $(assetsdir)/textures
+shadersdir = $(enginedir)/shaders
+assets_objs_DATA = \
+	assets/objs/suzanne.obj \
+	assets/objs/viking_room.obj
+assets_textures_DATA = \
+	assets/textures/texture.jpg \
+	assets/textures/viking_room.png
+EXTRA_DIST += $(assets_objs_DATA) $(assets_textures_DATA)
 
 # assets origin:
 # - assets/suzanne.obj
@@ -35,11 +42,10 @@ EXTRA_DIST += $(nobase_engine_DATA)
 #     modified by the author(s) of the vulkan tutorials (see
 #     https://docs.vulkan.org/tutorial/latest/08_Loading_models.html#_sample_mesh)
 
-nobase_engine_PROGRAMS = engine
-nobase_engine_SCRIPTS = src/shaders/shader.spv
-noinst_PROGRAMS = src/shaders/shader.spv.rmext
-AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = src/shaders/shader.spv
-CLEANFILES = src/shaders/shader.spv.rmext
+engine_PROGRAMS = engine
+shaders_SCRIPTS = shader.spv
+noinst_PROGRAMS = shader.spv.rmext
+CLEANFILES = shader.spv shader.spv.rmext
 
 engine_SOURCES = \
 	src/engine.cpp \
@@ -71,7 +77,7 @@ engine_SOURCES = \
 	src/shaders/shaders.hpp \
 	src/shaders/simple_shaders.hpp src/shaders/simple_shaders.cpp
 
-src_shaders_shader_spv_rmext_SOURCES = src/shaders/shader.slang
+shader_spv_rmext_SOURCES = src/shaders/shader.slang
 
 engine_CPPFLAGS = -std=gnu++23 -Wall -Wextra -I'$(srcdir)/src' \
 	-DASSETS_DIR='"$(ASSETS_DIR_CPP)"' \
@@ -79,7 +85,7 @@ engine_CPPFLAGS = -std=gnu++23 -Wall -Wextra -I'$(srcdir)/src' \
 	-DASSETS_TEXTURES_DIR='"$(ASSETS_TEXTURES_DIR_CPP)"' \
 	-DSHADERS_DIR='"$(SHADERS_DIR_CPP)"' \
 	$(GLFW3_CFLAGS) $(VULKAN_CFLAGS)
-if DEBUG
+if !DEBUG
 engine_CPPFLAGS += -DNDEBUG
 endif
 engine_LDFLAGS = -std=gnu++23 -Wall -Wextra
@@ -92,10 +98,10 @@ endif
 
 src/engine-stb_image.$(OBJEXT): CXXFLAGS += -Wno-unused-but-set-variable
 
-src_shaders_shader_spv_rmext_SLANGFLAGS = -target spirv -profile spirv_1_4 -emit-spirv-directly -fvk-use-entrypoint-name -entry vert_main -entry frag_main
+shader_spv_rmext_SLANGFLAGS = -target spirv -profile spirv_1_4 -emit-spirv-directly -fvk-use-entrypoint-name -entry vert_main -entry frag_main
 
-src/shaders/shader.spv.rmext$(EXEEXT): src/shaders/shader.slang
-	$(SLANGC) $(src_shaders_shader_spv_rmext_SLANGFLAGS) -o $@ $<
+shader.spv.rmext$(EXEEXT): src/shaders/shader.slang
+	$(SLANGC) $(shader_spv_rmext_SLANGFLAGS) -o $@ $<
 
-src/shaders/shader.spv: src/shaders/shader.spv.rmext$(EXEEXT)
+shader.spv: shader.spv.rmext$(EXEEXT)
 	cp -f $< $@
diff --git a/configure.ac b/configure.ac
index 85c5752..744694d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,13 +27,13 @@ AC_TYPE_UINT64_T
 AC_CHECK_FUNCS([floor memset modf pow setlocale sqrt strtol])
 
 AC_ARG_ENABLE([debug],
-	[AS_HELP_STRING([--enable-debug],
-		[make every path of files not built relative to the source tree, unset NDEBUG])],
-	[use_debug=$enableval],
-	[use_debug=no])
-AM_CONDITIONAL([DEBUG], [test x"$use_debug" = xyes])
+  [AS_HELP_STRING([--enable-debug],
+    [make every path of files not built relative to the source tree, unset NDEBUG])],
+  [enable_debug=$enableval],
+  [enable_debug=no])
+AM_CONDITIONAL([DEBUG], [test x"$enable_debug" = xyes])
 
-dnl TODO: check if c++23 is supported
+dnl TODO: check if C++23 is supported
 
 AC_CHECK_PROG([SLANGC], [slangc], [slangc])
 AS_VAR_IF([SLANGC], [], [AC_MSG_ERROR([slangc not found])])
@@ -43,19 +43,27 @@ PKG_CHECK_MODULES([GLFW3], [glfw3 >= 3.3.10])
 PKG_CHECK_MODULES([VULKAN], [vulkan])
 PKG_HAVE_DEFINE_WITH_MODULES([NCURSES], [ncurses >= 6.4.20230625])
 
-AC_LANG([C])
-CFLAGS_save="$CFLAGS"
+AC_LANG([C++])
+CXXFLAGS_save="$CXXFLAGS"
 LIBS_save="$LIBS"
 
-m4_define([vulkan_required_api_variant],   [0])
-m4_define([vulkan_required_api_major],     [1])
-m4_define([vulkan_required_api_minor],     [4])
-m4_define([vulkan_required_api_patch],   [313])
+# ENGINE_VULKAN_VER(VARIANT, MAJOR, MINOR, PATCH, [CMP])
+# ------------------------------------------------------
+m4_define([ENGINE_VULKAN_VER], [[variant ]$1[ version ]ifelse([$#], [5], [$5[ ]], [[]])$2[.]$3[.]$4])
+
+m4_define([vulkan_required_api_variant], [[0]])
+m4_define([vulkan_required_api_major],   [[1]])
+m4_define([vulkan_required_api_minor],   [[4]])
+m4_define([vulkan_required_api_patch], [[313]])
 m4_define([vulkan_required_api_str],
-	[variant ]m4_defn([vulkan_required_api_variant])[ version >= ]m4_defn([vulkan_required_api_major])[.]m4_defn([vulkan_required_api_minor])[.]m4_defn([vulkan_required_api_patch]))
-AC_MSG_CHECKING([for Vulkan headers ]m4_defn([vulkan_required_api_str]))
-CFLAGS="$VULKAN_CFLAGS"
-LIBS="$LIBS $VULKAN_LIBS"
+  [ENGINE_VULKAN_VER(
+    [vulkan_required_api_variant],
+    [vulkan_required_api_major],
+    [vulkan_required_api_minor],
+    [vulkan_required_api_patch],
+    [[>=]])])
+AC_MSG_CHECKING([for Vulkan headers ]vulkan_required_api_str)
+CXXFLAGS="$VULKAN_CFLAGS"
 AC_COMPUTE_INT([vulkan_api], [VK_HEADER_VERSION_COMPLETE], [
 #include <vulkan/vulkan.h>
 ], [AC_MSG_ERROR([cannot check Vulkan headers version])])
@@ -63,33 +71,33 @@ AS_VAR_ARITH([vulkan_api_variant], [$vulkan_api \>\> 29])
 AS_VAR_ARITH([vulkan_api_major],   [\( $vulkan_api \>\> 22 \) \& 127])
 AS_VAR_ARITH([vulkan_api_minor],   [\( $vulkan_api \>\> 12 \) \& 1023])
 AS_VAR_ARITH([vulkan_api_patch],   [$vulkan_api \& 4095])
+vulkan_api_str="ENGINE_VULKAN_VER([[$vulkan_api_variant]], [[$vulkan_api_major]], [[$vulkan_api_minor]], [[$vulkan_api_patch]])"
 vulkan_version_ok=no
-AS_VAR_ARITH([vulkan_version_cmp], [$vulkan_api_variant \!= ]m4_defn([vulkan_required_api_variant]))
-AS_VAR_IF([vulkan_version_cmp], [0], [
-	AS_VAR_ARITH([vulkan_version_cmp], [$vulkan_api_major \>= ]m4_defn([vulkan_required_api_major]))
-	AS_VAR_IF([vulkan_version_cmp], [1], [
-		AS_VAR_ARITH([vulkan_version_cmp], [$vulkan_api_major \> ]m4_defn([vulkan_required_api_major]))
-		AS_VAR_IF([vulkan_version_cmp], [1], [vulkan_version_ok=yes], [
-			AS_VAR_ARITH([vulkan_version_cmp], [$vulkan_api_minor \>= ]m4_defn([vulkan_required_api_minor]))
-			AS_VAR_IF([vulkan_version_cmp], [1], [
-				AS_VAR_ARITH([vulkan_version_cmp], [$vulkan_api_minor \> ]m4_defn([vulkan_required_api_minor]))
-				AS_VAR_IF([vulkan_version_cmp], [1], [vulkan_version_ok=yes], [
-					AS_VAR_ARITH([vulkan_version_cmp], [$vulkan_api_patch \>= ]m4_defn([vulkan_required_api_patch]))
-					AS_VAR_IF([vulkan_version_cmp], [1], [vulkan_version_ok=yes])
-				])
-			])
-		])
-	])
+AS_VAR_IF([vulkan_api_variant], vulkan_required_api_variant, [
+  AS_VAR_ARITH([vulkan_version_cmp], [$vulkan_api_major \>= ]vulkan_required_api_major)
+  AS_VAR_IF([vulkan_version_cmp], [1], [
+    AS_VAR_ARITH([vulkan_version_cmp], [$vulkan_api_major \> ]vulkan_required_api_major)
+    AS_VAR_IF([vulkan_version_cmp], [1], [vulkan_version_ok=yes], [
+      AS_VAR_ARITH([vulkan_version_cmp], [$vulkan_api_minor \>= ]vulkan_required_api_minor)
+      AS_VAR_IF([vulkan_version_cmp], [1], [
+        AS_VAR_ARITH([vulkan_version_cmp], [$vulkan_api_minor \> ]vulkan_required_api_minor)
+        AS_VAR_IF([vulkan_version_cmp], [1], [vulkan_version_ok=yes], [
+          AS_VAR_ARITH([vulkan_version_cmp], [$vulkan_api_patch \>= ]vulkan_required_api_patch)
+          AS_VAR_IF([vulkan_version_cmp], [1], [vulkan_version_ok=yes])
+        ])
+      ])
+    ])
+  ])
 ])
 AS_VAR_IF([vulkan_version_ok], [yes],
-	[AC_MSG_RESULT([yes])],
-	[
-		AC_MSG_RESULT([no])
-		AC_MSG_ERROR(
-			[Vulkan headers variant $vulkan_api_variant version $vulkan_api_major.$vulkan_api_minor.$vulkan_api_patch found, but ]m4_defn([vulkan_required_api_str])[ required])
-	])
+  [AC_MSG_RESULT([yes])],
+  [
+    AC_MSG_RESULT([no])
+    AC_MSG_ERROR(
+      [Vulkan headers $vulkan_api_str found, but ]vulkan_required_api_str[ required])
+  ])
 
-CFLAGS="$CFLAGS_save"
+CXXFLAGS="$CXXFLAGS_save"
 LIBS="$LIBS_save"
 
 AC_OUTPUT