feat: improve configure.ac (#60)

feat: refactor MINGW32_BUILD defines to WINDOWS_BUILD

feat: bump amboso to 2.0.0

feat: bump invil to 0.2.1

feat: add SHARED_LIB define, which is now also in pack chain

.gitignore

@@ -4,6 +4,8 @@
 *.so
 # ignore .a files
 *.a
+# ignore .dll files
+*.dll
 # also explicitly ignore our executable for good measure
 demo
 # also explicitly ignore our windows executable for good measure

Makefile.am

@@ -57,7 +57,7 @@ libkoliseo.o: $(lib_SOURCES)
 	$(CCOMP) -c $(CFLAGS) $(AM_CFLAGS) -fPIC $< -o $@
 	@echo -e "\033[1;33mDone.\e[0m"
 
-libkoliseo.so: libkoliseo.o
+$(SHARED_LIB): libkoliseo.o
 	@echo -e "\033[1;35m[Makefile]\e[0m    Building \"$@\":"
 	@echo -e "    \033[1;35mAM_CFLAGS\e[0m: [ \"\033[1;34m$(AM_CFLAGS)\e[0m\" ]"
 	@echo -e "    \033[1;35mCFLAGS\e[0m: [ \"\033[1;34m$(CFLAGS)\e[0m\" ]"
@@ -73,7 +73,7 @@ libkoliseo.a: libkoliseo.o
 %.o: %.c
 	$(CCOMP) -c $(CFLAGS) $(AM_CFLAGS) $< -o $@
 
-install: libkoliseo.so doc
+install: $(SHARED_LIB) doc
 	@echo -en "Installing koliseo lib $(VERSION):  "
 	./installer-sh "-i" $(VERSION) $(TARGET_INSTALL_DIR) $(SOURCE_INSTALL_DIR) $(INSTALLER_LOG_FILE)
 	ldconfig
@@ -121,20 +121,26 @@ clean:
 	-rm $(TARGET)
 	-rm ./*.o
 	-rm ./*.so
+	-rm ./*.dll
 	-rm src/*.o
 	-rm src/*.so
+	-rm src/*.dll
 	-rm static/*.o
 	-rm static/*.so
+	-rm static/*.dll
 	@echo -e "\033[1;33mDone.\e[0m"
 
 cleanob:
 	@echo -en "Cleaning object build artifacts:  "
 	-rm ./*.o
 	-rm ./*.so
+	-rm ./*.dll
 	-rm src/*.o
 	-rm src/*.so
+	-rm src/*.dll
 	-rm static/*.o
 	-rm static/*.so
+	-rm static/*.dll
 	@echo -e "\033[1;33mDone.\e[0m"
 
 bad_size.k:
@@ -216,7 +222,9 @@ pack: rebuild
 	@echo -e "\033[1;32m[TREE] Done.\e[0m"
 	@echo -e "\033[1;35m[PACK] Installing:\e[0m"
 	install $(TARGET) ~/koliseo-local/share/$(PACK_NAME)
+	install $(SHARED_LIB) ~/koliseo-local/share/$(PACK_NAME)
 	install README.md ~/koliseo-local/share/$(PACK_NAME)
+	install LICENSE ~/koliseo-local/share/$(PACK_NAME)
 	install ./src/koliseo.c ~/koliseo-local/share/$(PACK_NAME)/src
 	install ./src/koliseo.h ~/koliseo-local/share/$(PACK_NAME)/src
 
@@ -230,7 +238,7 @@ pack: rebuild
 	@echo -e "\033[1;33mDone.\e[0m"
 
 # Default target (builds everything)
-all: $(TARGET) libkoliseo.so libkoliseo.a
+all: $(TARGET) $(SHARED_LIB) libkoliseo.a
 
 # Target to clean and rebuild
 rebuild: clean all

bin/stego.lock

@@ -54,3 +54,4 @@ testsdir = "ok"
 "0.3.17" = "Global lib install, config options, invil 0.1.5"
 "0.3.18" = "invil 0.1.6, fixes broken ./anvil -i"
 "0.3.19" = "Add .a rule, bump invil"
+"0.3.20" = "Improve configure.ac, refactor MINGW32_BUILD, add SHARED_LIB define"

bin/v0.3.20/.gitignore

@@ -0,0 +1,4 @@
+#amboso compliant version folder, will ignore everything inside BUT the gitignore, to keep the clean dir
+*
+!.gitignore
+!static

bin/v0.3.20/static

@@ -0,0 +1 @@
+../../static/

configure.ac

@@ -1,15 +1,16 @@
 # Define the package name and version
-AC_INIT([koliseo], [0.3.19], [[email protected]])
+AC_INIT([koliseo], [0.3.20], [[email protected]])
 
 # Verify automake version and enable foreign option
 AM_INIT_AUTOMAKE([foreign -Wall])
 
 # Detect the host system and set PACK_PREFIX accordingly
 AC_CANONICAL_HOST
+build_linux=no
+build_windows=no
+build_mac=no
 echo "Host os:  $host_os"
-AM_CONDITIONAL([OS_DARWIN], [test "$host_os" = "darwin"])
-AM_CONDITIONAL([MINGW32_BUILD], [test "$host_os" = "mingw32"])
-#
+
 AC_ARG_ENABLE([debug],
   [AS_HELP_STRING([--enable-debug], [Enable debug build])],
   [enable_debug=$enableval],
@@ -27,53 +28,68 @@ AM_CONDITIONAL([CURSES_BUILD], [test "$enable_curses" = "yes"])
 AM_CONDITIONAL([GULP_BUILD], [test "$enable_gulp" = "yes"])
 
 # Define the include and library paths based on the host system
-if test "$host_os" = "mingw32"; then
-  echo "Building for mingw32: [$host_cpu-$host_vendor-$host_os]"
-  # mingw32 specific flags
-  if test "$enable_curses" = "yes"; then
-    echo "Building with curses header"
-    AC_SUBST([KOLISEO_CFLAGS], ["-I/usr/x86_64-w64-mingw32/include -static -fstack-protector -DMINGW32_BUILD -DNCURSES_STATIC"])
-    AC_SUBST([KOLISEO_LDFLAGS], ["-L/usr/x86_64-w64-mingw32/lib -lncursesw"])
-  else
-    AC_SUBST([KOLISEO_CFLAGS], ["-I/usr/x86_64-w64-mingw32/include -static -fstack-protector -DMINGW32_BUILD"])
-    AC_SUBST([KOLISEO_LDFLAGS], ["-L/usr/x86_64-w64-mingw32/lib"])
-  fi
-  AC_SUBST([CCOMP], ["/usr/bin/x86_64-w64-mingw32-gcc"])
-  AC_SUBST([OS], ["w64-mingw32"])
-  AC_SUBST([TARGET], ["demo.exe"])
-fi
-if test "$host_os" = "darwin"; then
-  echo "Building for macos: [$host_cpu-$host_vendor-$host_os]"
-  # macOS specific flags
-  if test "$enable_curses" = "yes"; then
-      echo "Building with curses header"
-      AC_SUBST([KOLISEO_LDFLAGS], ["-L/opt/homebrew/opt/ncurses/lib -lncurses"])
-      AC_SUBST([KOLISEO_CFLAGS], ["-I/opt/homebrew/opt/ncurses/include"])
-  else
-      AC_SUBST([KOLISEO_LDFLAGS], [""])
-      AC_SUBST([KOLISEO_CFLAGS], [""])
-  fi
-  AC_SUBST([OS], ["darwin"])
-  AC_SUBST([TARGET], ["demo"])
-fi
-if test "$host_os" = "linux-gnu"; then
-  echo "Building for Linux: [$host_cpu-$host_vendor-$host_os]"
-  # Linux specific flags
-  if test "$enable_curses" = "yes"; then
-      echo "Building with curses header"
-      AC_SUBST([KOLISEO_LDFLAGS], ["-lncurses"])
-  else
-      AC_SUBST([KOLISEO_LDFLAGS], [""])
-  fi
-  AC_SUBST([KOLISEO_CFLAGS], [""])
-  AC_SUBST([OS], ["Linux"])
-  AC_SUBST([TARGET], ["demo"])
-fi
+case "${host_os}" in
+    mingw*)
+        echo "Building for mingw32: [$host_cpu-$host_vendor-$host_os]"
+        # mingw32 specific flags
+        if test "$enable_curses" = "yes"; then
+            echo "Building with curses header"
+            build_windows=yes
+            AC_SUBST([KOLISEO_CFLAGS], ["-I/usr/x86_64-w64-mingw32/include -static -fstack-protector -DWINDOWS_BUILD -DNCURSES_STATIC"])
+            AC_SUBST([KOLISEO_LDFLAGS], ["-L/usr/x86_64-w64-mingw32/lib -lncursesw"])
+        else
+            AC_SUBST([KOLISEO_CFLAGS], ["-I/usr/x86_64-w64-mingw32/include -static -fstack-protector -DWINDOWS_BUILD"])
+            AC_SUBST([KOLISEO_LDFLAGS], ["-L/usr/x86_64-w64-mingw32/lib"])
+        fi
+        AC_SUBST([CCOMP], ["/usr/bin/x86_64-w64-mingw32-gcc"])
+        AC_SUBST([OS], ["w64-mingw32"])
+        AC_SUBST([TARGET], ["demo.exe"])
+        AC_SUBST([SHARED_LIB], ["libkoliseo.dll"])
+    ;;
+    darwin*)
+        echo "Building for macos: [$host_cpu-$host_vendor-$host_os]"
+        build_mac=yes
+        # macOS specific flags
+        if test "$enable_curses" = "yes"; then
+            echo "Building with curses header"
+            AC_SUBST([KOLISEO_LDFLAGS], ["-L/opt/homebrew/opt/ncurses/lib -lncurses"])
+            AC_SUBST([KOLISEO_CFLAGS], ["-I/opt/homebrew/opt/ncurses/include"])
+        else
+            AC_SUBST([KOLISEO_LDFLAGS], [""])
+            AC_SUBST([KOLISEO_CFLAGS], [""])
+        fi
+        AC_SUBST([OS], ["darwin"])
+        AC_SUBST([TARGET], ["demo"])
+        AC_SUBST([SHARED_LIB], ["libkoliseo.so"])
+    ;;
+    linux*)
+        echo "Building for Linux: [$host_cpu-$host_vendor-$host_os]"
+        build_linux=yes
+        # Linux specific flags
+        if test "$enable_curses" = "yes"; then
+            echo "Building with curses header"
+            AC_SUBST([KOLISEO_LDFLAGS], ["-lncurses"])
+        else
+            AC_SUBST([KOLISEO_LDFLAGS], [""])
+        fi
+        AC_SUBST([KOLISEO_CFLAGS], [""])
+        AC_SUBST([OS], ["Linux"])
+        AC_SUBST([TARGET], ["demo"])
+        AC_SUBST([SHARED_LIB], ["libkoliseo.so"])
+    ;;
+    *)
+        AC_MSG_ERROR(["OS $host_os is not supported"])
+    ;;
+esac
+
+AM_CONDITIONAL([WINDOWS_BUILD], [test "$build_windows" = "yes"])
+AM_CONDITIONAL([DARWIN_BUILD], [test "$build_mac" = "yes"])
+AM_CONDITIONAL([LINUX_BUILD], [test "$build_linux" = "yes"])
 
 # Set a default version number if not specified externally
 AC_ARG_VAR([VERSION], [Version number])
 if test -z "$VERSION"; then
-  VERSION="0.3.19"
+  VERSION="0.3.20"
 fi
 
 # Output variables to the config.h header

docs/koliseo.doxyfile

@@ -48,7 +48,7 @@ PROJECT_NAME           = "koliseo"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER         = "0.3.19"
+PROJECT_NUMBER         = "0.3.20"
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a