From f8616f12b6daa07314d50bb56ccc9ad9223b3b7b Mon Sep 17 00:00:00 2001 From: Andrii Kurdiumov Date: Tue, 17 Oct 2023 20:45:31 +0600 Subject: [PATCH] Fix compilation using CL I rename decNumber.c to decNumbern.c so compilation process produce different obj files. Otherwise file from nativelib override file form decNumber folder and linking fails. I did not update nativelib.dll since that should be done by you probably. --- Libraries/Otterkit.Native/nativelib/CASPAL.h | 2 -- Libraries/Otterkit.Native/nativelib/compiling.md | 4 ++-- .../Otterkit.Native/nativelib/{decNumber.c => decNumbern.c} | 0 3 files changed, 2 insertions(+), 4 deletions(-) rename Libraries/Otterkit.Native/nativelib/{decNumber.c => decNumbern.c} (100%) diff --git a/Libraries/Otterkit.Native/nativelib/CASPAL.h b/Libraries/Otterkit.Native/nativelib/CASPAL.h index 03e89932..eb7e7d09 100644 --- a/Libraries/Otterkit.Native/nativelib/CASPAL.h +++ b/Libraries/Otterkit.Native/nativelib/CASPAL.h @@ -34,8 +34,6 @@ #endif #if !defined __STDC_VERSION__ - // Will error on MSVC! It still seems to be stuck on C89, it doesn't define __STDC_VERSION__, and only runs on Windows. - // (Not worth the preprocessor gymnastics and compiler-specific hacks to support it in my opinion!) #error "Standard C99 (or later) support is required. Consider upgrading your compiler, or using GCC or Clang instead." #endif diff --git a/Libraries/Otterkit.Native/nativelib/compiling.md b/Libraries/Otterkit.Native/nativelib/compiling.md index bf79640e..ef21babb 100644 --- a/Libraries/Otterkit.Native/nativelib/compiling.md +++ b/Libraries/Otterkit.Native/nativelib/compiling.md @@ -2,11 +2,11 @@ "C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvars64.bat" -cl.exe /O2 /LD /Fe:..\build\nativelib.dll allocator.c u8console.c decNumber.c ..\decNumber\decContext.c ..\decNumber\decDouble.c ..\decNumber\decQuad.c ..\decNumber\decNumber.c ..\decNumber\decimal128.c ..\decNumber\decimal64.c +cl.exe /O2 /LD /Fe:..\build\nativelib.dll allocator.c u8console.c decNumbern.c ..\decNumber\decContext.c ..\decNumber\decDouble.c ..\decNumber\decQuad.c ..\decNumber\decNumber.c ..\decNumber\decimal128.c ..\decNumber\decimal64.c ## compile linux-x64: -clang -shared -Wl,-rpath -O3 -fPIC -Wall -W -o ../build/nativelib.so *.c decNumber.c ../decNumber/decContext.c ../decNumber/decDouble.c ../decNumber/decQuad.c ../decNumber/decNumber.c ../decNumber/decimal128.c ../decNumber/decimal64.c +clang -shared -Wl,-rpath -O3 -fPIC -Wall -W -o ../build/nativelib.so *.c decNumbern.c ../decNumber/decContext.c ../decNumber/decDouble.c ../decNumber/decQuad.c ../decNumber/decNumber.c ../decNumber/decimal128.c ../decNumber/decimal64.c ## compile macos-x64: diff --git a/Libraries/Otterkit.Native/nativelib/decNumber.c b/Libraries/Otterkit.Native/nativelib/decNumbern.c similarity index 100% rename from Libraries/Otterkit.Native/nativelib/decNumber.c rename to Libraries/Otterkit.Native/nativelib/decNumbern.c