Make TestAPI a C file and update build targets

Author: flanglet

src/CMakeLists.txt

@@ -1,16 +1,24 @@
 cmake_minimum_required(VERSION 3.10)
-project(kanzi)
+project(kanzi LANGUAGES C CXX)
 
 # Set C++ standard
 set(CMAKE_CXX_STANDARD 17)
 #set(CMAKE_CXX_STANDARD_REQUIRED True)
 #set(CMAKE_CXX_COMPILER "clang++")
 
+# Set C standard (for TestAPI.c)
+set(CMAKE_C_STANDARD 11)
+#set(CMAKE_C_STANDARD_REQUIRED True)
+#set(CMAKE_C_COMPILER "clang")
+
 if(CONCURRENCY_DISABLED)
     add_definitions(-DCONCURRENCY_DISABLED)
 endif()
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -O3 -fomit-frame-pointer -fPIC -DNDEBUG -pedantic -march=native -fno-rtti")
+set(COMMON_FLAGS "-Wall -Wextra -O3 -fomit-frame-pointer -fPIC -DNDEBUG -pedantic -march=native -fno-rtti")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${COMMON_FLAGS}")
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMMON_FLAGS}")
+
 
 if(MSVC)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
@@ -95,7 +103,7 @@ set_target_properties(libkanzi_shared PROPERTIES OUTPUT_NAME "kanzi")
 #add_library(libkanzi_comp_shared SHARED ${LIB_COMP_SOURCES})
 #add_library(libkanzi_decomp_shared SHARED ${LIB_DECOMP_SOURCES})
 
-# Test executables
+# Executable target for C++
 add_executable(testBWT test/TestBWT.cpp)
 target_link_libraries(testBWT libkanzi)
 
@@ -111,8 +119,11 @@ target_link_libraries(testDefaultBitStream libkanzi)
 add_executable(testCompressedStream test/TestCompressedStream.cpp)
 target_link_libraries(testCompressedStream libkanzi)
 
-add_executable(testAPI test/TestAPI.cpp)
+# Executable target for C API test (TestAPI.c)
+add_executable(testAPI test/TestAPI.c)
 target_link_libraries(testAPI libkanzi)
+# IMPORTANT: Force use of C++ Linker because we link against C++ lib 'archon_static'
+set_target_properties(testAPI PROPERTIES LINKER_LANGUAGE CXX)
 
 # Main executable
 

src/Makefile

@@ -1,3 +1,4 @@
+#CC=clang
 #CXX=clang++
 OBJ_DIR = obj
 TEST_OBJ_DIR=$(OBJ_DIR)/test
@@ -16,6 +17,8 @@ ifeq ($(CONCURRENCY_DISABLED), 1)
 	CONCURRENCY_FLAG = -DCONCURRENCY_DISABLED
 endif
 
+CFLAGS=-c -std=c11 -Wall -Wextra -O3 -fPIC -pedantic -march=native
+
 ifeq ($(OS),Windows_NT)
 	CXXFLAGS=-c -std=c++11 -Wall -Wextra -O3 -fomit-frame-pointer -fPIC -DNDEBUG -pedantic -march=native -fno-rtti $(CONCURRENCY_FLAG)
 	LDFLAGS=-lpthread
@@ -86,7 +89,8 @@ TEST_SOURCES=test/TestEntropyCodec.cpp \
 	test/TestBWT.cpp \
 	test/TestCompressedStream.cpp \
 	test/TestDefaultBitStream.cpp \
-	test/TestTransforms.cpp
+	test/TestTransforms.cpp \
+	test/TestAPI.c
 
 APP_SOURCES=app/Kanzi.cpp \
 	app/InfoPrinter.cpp \
@@ -281,3 +285,7 @@ $(OBJ_DIR)/%.o: %.cpp
 	@$(MKDIR)
 	$(CXX) $(CXXFLAGS) $< -o $@
 
+$(OBJ_DIR)/%.o: %.c
+	@$(MKDIR)
+	$(CC) $(CFLAGS) $< -o $@
+

src/api/Compressor.hpp

@@ -39,9 +39,9 @@ limitations under the License.
 #endif
 
 
-static constexpr unsigned KANZI_COMP_VERSION_MAJOR = 1;
-static constexpr unsigned KANZI_COMP_VERSION_MINOR = 0;
-static constexpr unsigned KANZI_COMP_VERSION_PATCH = 0;
+#define KANZI_COMP_VERSION_MAJOR 1
+#define KANZI_COMP_VERSION_MINOR 0
+#define KANZI_COMP_VERSION_PATCH 0
 
 
 #ifdef __cplusplus

src/api/Decompressor.cpp

@@ -185,7 +185,7 @@ KANZI_API int CDECL initDecompressor(struct dData* pData, FILE* src, struct dCon
 }
 
 
-KANZI_API int CDECL decompress(struct dContext* pCtx, unsigned char* dst, 
+KANZI_API int CDECL decompress(struct dContext* pCtx, unsigned char* dst,
                                size_t* inSize, size_t* outSize) KANZI_NOEXCEPT
 {
     if ((pCtx == nullptr) || (outSize == nullptr)) {

src/api/Decompressor.hpp

@@ -39,9 +39,9 @@ limitations under the License.
 #endif
 
 
-static constexpr unsigned KANZI_DECOMP_VERSION_MAJOR  = 1;
-static constexpr unsigned KANZI_DECOMP_VERSION_MINOR  = 0;
-static constexpr unsigned KANZI_DECOMP_VERSION_PATCH  = 0;
+#define KANZI_DECOMP_VERSION_MAJOR 1
+#define KANZI_DECOMP_VERSION_MINOR 0
+#define KANZI_DECOMP_VERSION_PATCH 0
 
 
 #ifdef __cplusplus