Update C code generation and compilation.

MilanSkocic · Nov 20, 2024 · d3c9f96 · d3c9f96
1 parent b4609bc
commit d3c9f96
Show file tree

Hide file tree

Showing 9 changed files with 35 additions and 15 deletions.
diff --git a/C/Makefile b/C/Makefile
@@ -3,7 +3,7 @@
 
 .PHONY: headers sources build clean
 
-all: headers sources
+all: headers sources build
 
 
 headers: 
@@ -14,7 +14,7 @@ sources: headers
 
 build:
 	mkdir -p $(BUILD_DIR)
-	make -C src build
+	make -C src
 
 clean:
 	make -C include clean

diff --git a/C/example/Makefile b/C/example/Makefile
@@ -0,0 +1,6 @@
+
+
+all: example
+
+example: example.c
+	gcc -I../include -L../build/ -lcodata $(CFLAGS_RELEASE) $(FPM_CFLAGS) $< -o $@
diff --git a/C/example/example.c b/C/example/example.c
@@ -1,12 +1,13 @@
 #include <stdio.h>
-#include "codata.h"
+#include "codata_version.h"
+#include "codata_constants_2022.h"
 
 int main(void){
 
     printf("########## EXAMPLE IN C ##########\n");
 
     printf("%s\n","########## VERSION ##########");
-    printf("version = %s\n", codata_get_version());
+    printf("version = %s\n", version);
 
     printf("%s\n","########## CONSTANTS ##########");
     printf("c = %f\n", SPEED_OF_LIGHT_IN_VACUUM.value);
@@ -16,9 +17,9 @@ int main(void){
 
     printf("%s\n","########## OLDER VALUES ##########");
     printf("Mu_2022(latest) = %23.16f\n", MOLAR_MASS_CONSTANT.value);
-    printf("Mu_2018 = %23.16f\n", MOLAR_MASS_CONSTANT_2018.value);
-    printf("Mu_2014 = %23.16f\n", MOLAR_MASS_CONSTANT_2014.value);
-    printf("Mu_2010 = %23.16f\n", MOLAR_MASS_CONSTANT_2010.value);
+    //printf("Mu_2018 = %23.16f\n", MOLAR_MASS_CONSTANT_2018.value);
+    //printf("Mu_2014 = %23.16f\n", MOLAR_MASS_CONSTANT_2014.value);
+    //printf("Mu_2010 = %23.16f\n", MOLAR_MASS_CONSTANT_2010.value);
 
     return 0;
 }
diff --git a/C/example/example.exe b/C/example/example.exe
diff --git a/C/include/codata.h b/C/include/codata.h
@@ -5,6 +5,7 @@
 #else
 #define ADD_IMPORT
 #endif
+#include "codata_version.h"
 #include "codata_constants_type.h"
 #include "codata_constants_2010.h"
 #include "codata_constants_2014.h"

diff --git a/C/include/codata_constants_type.h b/C/include/codata_constants_type.h
@@ -1,7 +1,8 @@
 #ifndef CODATA_CONSTANTS_TYPE_H
 #define CODATA_CONSTANTS_TYPE_H
 
-struct codata_constant_type{
+struct codata_constant_type
+{
     char name[65];
     double value;
     double uncertainty;

diff --git a/C/include/codata_version.h b/C/include/codata_version.h
@@ -1,4 +1,4 @@
 #ifndef CODATA_VERSION_H
 #define CODATA_VERSION_H
-const char version[32] = 2.0.0
+const char version[32] = "2.0.0";
 #endif
diff --git a/C/src/Makefile b/C/src/Makefile
@@ -7,11 +7,11 @@ CBUILD_DIR = ../build
 AST_SRC=$(wildcard $(AST_DIR)/*.toml)
 C_SRC = codata_constants_2010.c codata_constants_2014.c codata_constants_2018.c codata_constants_2022.c 
 C_OBJ=$(patsubst %.c, $(CBUILD_DIR)/%.o, $(C_SRC))
-DLIB=$(CBUILD_DIR)/$(LIBNAME)$(EXT)
+DLIB=$(CBUILD_DIR)/$(LIBNAME).a
 
 .PHONY: clean
 
-all: sources
+all: sources build shared
 
 sources: $(C_SRC)
 
@@ -32,8 +32,19 @@ codata_constants_2022.c: $(AST_DIR)/codata_2022.toml
 $(CBUILD_DIR)/%.o: %.c
 	gcc -c -I ../include $(CFLAGS_RELEASE) $(FPM_CFLAGS) $< -o $@
 
-$(CBUILD_DIR)/$(LIBNAME)$(EXT): $(C_OBJ)
-	gcc -shared $(C_OBJ) -o $@
+$(CBUILD_DIR)/$(LIBNAME).a: $(C_OBJ)
+	ar -rs $@ $^
+
+shared: build shared_$(PLATFORM)
+
+shared_linux: 
+	$(CC) -shared -o $(CBUILD_DIR)/$(LIBNAME).so -Wl,--whole-archive $(CBUILD_DIR)/$(LIBNAME).a -Wl,--no-whole-archive
+
+shared_darwin: 
+	$(CC) -dynamiclib -install_name @rpath/$(LIBNAME).dylib $(FPM_LDFLAGS) -o $(CBUILD_DIR)/$(LIBNAME).dylib -Wl,-all_load $(CBUILD_DIR)/$(LIBNAME).a
+
+shared_windows: 
+	$(CC) -shared $(FPM_LDFLAGS) -o $(CBUILD_DIR)/$(LIBNAME).dll -Wl,--out-implib=$(CBUILD_DIR)/$(LIBNAME).dll.a,--export-all-symbols,--enable-auto-import,--whole-archive $(CBUILD_DIR)/$(LIBNAME).a -Wl,--no-whole-archive
 
 clean:
 	rm -rf $(C_SRC)

diff --git a/configure.sh b/configure.sh
@@ -14,8 +14,8 @@ INCLUDE_DIR="./include"
 FPM_FFLAGS="-std=f2008 -pedantic -Wall -Wextra"
 FPM_CFLAGS="-std=c11 -pedantic -Wall -Wextra"
 FPM_LDFLAGS=""
-CFLAGS_RELEASE="-fPIC -O3 -funroll-loops"
-CFLAGS_DEBUG="-fPIC -g"
+CFLAGS_RELEASE="-fPIC -O3 -funroll-loops -fmax-errors=1"
+CFLAGS_DEBUG="-fPIC -g -fmax-errors=1"
 DEFAULT_INSTALL_DIR="$HOME/.local"
 PLATFORM="linux"
 EXT=".so"