Improvements to the build system

Author: EimaKve

.github/workflows/linux.yml

@@ -68,16 +68,16 @@ jobs:
 
     - name: Tests
       run: |
-        make compile_tests CC=gcc MODE=DEBUG USE_C2X_FLAG=1
+        make compile_tests CC=gcc LANGUAGE=c2x MODE=DEBUG
 
     - name: Examples
       run: |
-        make compile_examples CC=gcc MODE=DEBUG USE_C2X_FLAG=1
+        make compile_examples CC=gcc LANGUAGE=c2x MODE=DEBUG
 
     - name: Build Library
       run: |
-        make static  CC=gcc MODE=RELEASE USE_C2X_FLAG=1
-        make dynamic CC=gcc MODE=RELEASE USE_C2X_FLAG=1
+        make static  CC=gcc LANGUAGE=c2x MODE=RELEASE
+        make dynamic CC=gcc LANGUAGE=c2x MODE=RELEASE
       if: matrix.bits == 64
 
     - name: Generate Artifacts

.github/workflows/macos.yml

@@ -51,11 +51,11 @@ jobs:
       
     - name: Tests
       run: |
-        make compile_tests CC=clang MODE=DEBUG
+        make compile_tests CC=clang LANGUAGE=c2x MODE=DEBUG
 
     - name: Examples
       run: |
-        make compile_examples CC=clang MODE=DEBUG
+        make compile_examples CC=clang LANGUAGE=c2x MODE=DEBUG
 
     - name: Build Library
       run: |
@@ -65,12 +65,12 @@ jobs:
         brew install grep
         
         # Build sili x86_64 & arm64 static
-        make static CC=clang EXTRA_FLAGS="-target x86_64-apple-macos10.12" LIB_NAME="sili_x86_64"
-        make static CC=clang EXTRA_FLAGS="-target arm64-apple-macos11"     LIB_NAME="sili_arm64"
+        make static CC=clang MODE=RELEASE LANGUAGE=c2x EXTRA_FLAGS="-target x86_64-apple-macos10.12" LIB_NAME="sili_x86_64"
+        make static CC=clang MODE=RELEASE LANGUAGE=c2x EXTRA_FLAGS="-target arm64-apple-macos11"     LIB_NAME="sili_arm64"
         
         # Build sili x86_64 & arm64 dynamic
-        make dynamic CC=clang EXTRA_FLAGS="-target x86_64-apple-macos10.12" LIB_NAME="sili_x86_64"
-        make dynamic CC=clang EXTRA_FLAGS="-target arm64-apple-macos11"     LIB_NAME="sili_arm64"
+        make dynamic CC=clang MODE=RELEASE LANGUAGE=c2x EXTRA_FLAGS="-target x86_64-apple-macos10.12" LIB_NAME="sili_x86_64"
+        make dynamic CC=clang MODE=RELEASE LANGUAGE=c2x EXTRA_FLAGS="-target arm64-apple-macos11"     LIB_NAME="sili_arm64"
   
     - name: Generate Artifacts
       run: |

.github/workflows/windows.yml

@@ -81,15 +81,15 @@ jobs:
     # MinGW
     - name: Tests (MinGW-w64 64-bit)
       run: |
-        make compile_tests CC=${{ matrix.ARCH }}-w64-mingw32-gcc USE_C2X_FLAG=1
+        make compile_tests CC=${{ matrix.ARCH }}-w64-mingw32-gcc LANGUAGE=c17 MODE=DEBUG
       shell: cmd
       if: |
         matrix.compiler == 'mingw-w64' &&
         matrix.bits == 64
 
     - name: Examples (MinGW-w64 64-bit)
       run: |
-        make compile_examples CC=${{ matrix.ARCH }}-w64-mingw32-gcc USE_C2X_FLAG=1
+        make compile_examples CC=${{ matrix.ARCH }}-w64-mingw32-gcc LANGUAGE=c17 MODE=DEBUG
       shell: cmd
       if: |
         matrix.compiler == 'mingw-w64' &&
@@ -100,8 +100,8 @@ jobs:
         ${{ matrix.ARCH }}-w64-mingw32-gcc.exe --version
         windres.exe --version
         dir C:\msys64\mingw64\bin
-        make static CC=${{ matrix.ARCH }}-w64-mingw32-gcc USE_C2X_FLAG=1
-        make dynamic CC=${{ matrix.ARCH }}-w64-mingw32-gcc USE_C2X_FLAG=1
+        make static  CC=${{ matrix.ARCH }}-w64-mingw32-gcc LANGUAGE=c17 MODE=RELEASE
+        make dynamic CC=${{ matrix.ARCH }}-w64-mingw32-gcc LANGUAGE=c17 MODE=RELEASE
         copy /Y .\build\libsili.dll .\build\${{ env.RELEASE_NAME }}\lib
       shell: cmd
       if: |
@@ -112,24 +112,27 @@ jobs:
     # MSVC  
     - name: Tests (MSVC16 64-bit)
       run: |
-        make compile_tests CC=cl.exe
+        make compile_tests LANGUAGE=c17 MODE=DEBUG CC=cl.exe
+      shell: powershell
       if: |
         matrix.compiler == 'msvc16' &&
         matrix.bits == 64
 
     - name: Examples (MSVC16 64-bit)
       run: |
-        make compile_examples CC=cl.exe
+        make compile_examples LANGUAGE=c17 MODE=DEBUG CC=cl.exe
+      shell: powershell
       if: |
         matrix.compiler == 'msvc16' &&
         matrix.bits == 64
 
     - name: Build Library (MSVC16 64-bit)
       run: |
         windres.exe --version
-        make static CC=cl.exe AR=lib
-        make dynamic CC=cl.exe
+        make static  CC=cl.exe LANGUAGE=c17 MODE=RELEASE
+        make dynamic CC=cl.exe LANGUAGE=c17 MODE=RELEASE
         copy /Y .\build\libsili.dll .\build\${{ env.RELEASE_NAME }}\lib
+      shell: powershell
       if: |
         matrix.compiler == 'msvc16' &&
         matrix.bits == 64

Makefile

@@ -10,13 +10,13 @@
 # 'DEBUG' turns on all warnings as well as flags to help with debugging/finding 
 # problematic code. 'RELEASE' turns on all optimisations as well as warnings.
 # 
-# 	LANGUAGE - selects which programming language to target. Currently C and C++ 
-# are the only valid options.
+# 	LANGUAGE - selects which programming language (and standard) to use. Available 
+# values: c99, c11, c17, c18, c2x/c23, c++11, c++14, c++17, c++20, etc.
 
 CC        = clang
 PLATFORM  = DEFAULT
 MODE      = FAST
-LANGUAGE  = C
+LANGUAGE  = c23
 
 
 # General building options:
@@ -75,14 +75,15 @@ ifeq ($(PLATFORM),DEFAULT)
 endif
 
 
-ifeq ($(LANGUAGE),C)
-	ifeq ($(or $(filter OS_X,$(PLATFORM)),$(USE_C2X_FLAG)),)
-		GNU_FLAGS = -std=c23 -x c -Wvla
-	else 
-		GNU_FLAGS = -std=c2x -x c -Wvla
-	endif
-else ifeq ($(LANGUAGE),CPP)
-	GNU_FLAGS = -std=c++11 -x c++ -fno-exceptions
+#
+# GNU compiler configurations
+#
+ifneq ($(PLATFORM),WIN32_MSVC)
+
+ifneq (,$(filter cpp%,$(LANGUAGE)))
+	GNU_FLAGS = -std=$(LANGUAGE) -x c++ -fno-exceptions
+else
+	GNU_FLAGS = -std=$(LANGUAGE) -x c -Wvla
 endif
 
 
@@ -150,30 +151,8 @@ endif
 
 GNU_INCLUDES = -I"." -I"include"
 
-
-ifeq ($(PLATFORM),DEFAULT)
-	ifneq (,$(filter $(CC),mingw32-gcc x86_64-w64-mingw32-g++ w64gcc w32gcc))
-		PLATFORM = WIN32_GNU
-	else ifneq (,$(filter $(CC),cl))
-		PLATFORM = WIN32_MSVC
-	else ifneq (,$(filter $(CC), wasi))
-		PLATFORM = WASM_WASI
-	else ifneq (,$(filter $(CC), emcc))
-		PLATFORM = WASM_EMCC
-	else
-		DETECTED_OS := $(shell uname 2>/dev/null || echo Unknown)
-
-		ifeq ($(DETECTED_OS),Darwin)
-			PLATFORM = OS_X
-		else ifeq ($(DETECTED_OS),Linux)
-			PLATFORM = LINUX
-		else
-			$(error Unsupported platform. Please refer to the Makefile for supported platofmrs.)
-		endif
-	endif
 endif
 
-
 ifeq ($(PLATFORM),WIN32_GNU)
 	FLAGS = $(GNU_FLAGS)
 	INCLUDES = $(GNU_INCLUDES)
@@ -280,7 +259,11 @@ clean:
 
 
 $(EXE): $(SRC) sili.h Makefile examples/*
-	$(CC) $(FLAGS) $(EXTRA_FLAGS) $(SRC) $(INCLUDES) $(LIBS) -o "$@"
+    ifneq (,$(filter $(PLATFORM),WIN32_GNU OS_X LINUX WASM_WASI WASM_EMCC))
+		$(CC) $(FLAGS) $(EXTRA_FLAGS) $(SRC) $(INCLUDES) $(LIBS) -o "$@"
+    else ifneq (,$(filter $(PLATFORM),WIN32_MSVC))
+		$(CC) $(FLAGS) $(EXTRA_FLAGS) $(SRC) $(INCLUDES) $(LIBS) /Fe"$@"
+    endif
 
 static:
     ifneq (,$(filter $(PLATFORM),WIN32_GNU OS_X LINUX WASM_WASI WASM_EMCC))