Tweaks (#85)

.github/workflows/build-ios.yml

@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [macos-12,macos-13,macos-14]
-        arch: [arm64]
+        arch: [arm64, x64]
         cpurev: [default]
     steps:
 

.github/workflows/build-win.yml

@@ -31,6 +31,10 @@ jobs:
     - name: Checkout
       uses: actions/checkout@v4
 
+    # Upgrade LLVM
+    - name: Upgrade LLVM
+      run: choco upgrade llvm -y
+
     # Developer Console (X64)
     - name: MSVC Developer Console (X64)
       if: matrix.arch == 'x64'

build/make/CppCore.Debug.mk

@@ -76,7 +76,7 @@ OUTDIST   := $(DISTDIR)/$(NAME)-$(TARGET_ARCH)/usr/bin/$(NAME)$(EXTBIN)
 DEFINES   := $(DEFINES)
 CXXFLAGS  := $(CXXFLAGS)
 CFLAGS    := $(CFLAGS)
-LINKFLAGS := $(LINKFLAGS)
+LINKFLAGS := $(LINKFLAGS) -static-libstdc++ -static-libgcc 
 LINKLIBS  := $(LINKLIBS) -lpthread
 RESO      := $(RESO)
 endif

build/make/CppCore.Example.Client.mk

@@ -76,7 +76,7 @@ OUTDIST   := $(DISTDIR)/$(NAME)-$(TARGET_ARCH)/usr/bin/$(NAME)$(EXTBIN)
 DEFINES   := $(DEFINES)
 CXXFLAGS  := $(CXXFLAGS)
 CFLAGS    := $(CFLAGS)
-LINKFLAGS := $(LINKFLAGS)
+LINKFLAGS := $(LINKFLAGS) -static-libstdc++ -static-libgcc 
 LINKLIBS  := $(LINKLIBS) -lpthread
 RESO      := $(RESO)
 endif

build/make/CppCore.Example.Server.mk

@@ -77,7 +77,7 @@ OUTDIST   := $(DISTDIR)/$(NAME)-$(TARGET_ARCH)/usr/bin/$(NAME)$(EXTBIN)
 DEFINES   := $(DEFINES)
 CXXFLAGS  := $(CXXFLAGS)
 CFLAGS    := $(CFLAGS)
-LINKFLAGS := $(LINKFLAGS)
+LINKFLAGS := $(LINKFLAGS) -static-libstdc++ -static-libgcc 
 LINKLIBS  := $(LINKLIBS) -lpthread
 RESO      := $(RESO)
 endif

build/make/CppCore.Example.UI.mk

@@ -76,7 +76,7 @@ OUTDIST   := $(DISTDIR)/$(NAME)-$(TARGET_ARCH)/usr/bin/$(NAME)$(EXTBIN)
 DEFINES   := $(DEFINES)
 CXXFLAGS  := $(CXXFLAGS)
 CFLAGS    := $(CFLAGS)
-LINKFLAGS := $(LINKFLAGS)
+LINKFLAGS := $(LINKFLAGS) -static-libstdc++ -static-libgcc
 LINKLIBS  := $(LINKLIBS) -lpthread -lX11
 RESO      := $(RESO)
 endif

build/make/CppCore.Interface.C.mk

@@ -11,11 +11,16 @@ INCLUDES  := $(INCLUDES) \
              -I$(INCDIR) \
              -I$(SRCDIR)
 CXXFLAGS  := $(CXXFLAGS) \
-             -std=c++17 \
+             -std=c++17  \
+             -fno-builtin \
+             -fvisibility=hidden \
              -fno-exceptions \
+             -fno-unwind-tables \
+             -fno-asynchronous-unwind-tables \
+             -mno-stack-arg-probe \
              -fno-stack-protector \
              -fno-stack-check
-LINKFLAGS := $(LINKFLAGS) -shared
+LINKFLAGS := $(LINKFLAGS) -shared -fno-builtin
 LINKPATH  := $(LINKPATH)
 LINKLIBS  := $(LINKLIBS)
 OBJS       = cppcore.o
@@ -57,10 +62,13 @@ DEFINES   := $(DEFINES)
 INCLUDES  := $(INCLUDES)
 CXXFLAGS  := $(CXXFLAGS)
 LINKFLAGS := $(LINKFLAGS) \
+             -nostdlib \
+             -Xlinker /SAFESEH:NO \
+             -Xlinker /ENTRY:DllMain \
              -Xlinker /SUBSYSTEM:CONSOLE",10.00" \
              -Xlinker /PDBALTPATH:$(LIBNAME)$(SUFFIX)$(EXTPDB) \
              -DLL
-LINKLIBS  := $(LINKLIBS)
+LINKLIBS  := $(LINKLIBS) -lUCRT -lMSVCRT
 RESO      := $(RESO) resources.res
 ifeq ($(TARGET_ARCH),x86)
 DEFINES   := $(DEFINES) 
@@ -79,17 +87,19 @@ endif
 ifeq ($(TARGET_OS),osx)
 DEFINES     := $(DEFINES)
 INCLUDES    := $(INCLUDES)
-CXXFLAGS    := $(CXXFLAGS) -fno-builtin
+CXXFLAGS    := $(CXXFLAGS)
 LINKFLAGS   := $(LINKFLAGS) \
-               -fno-builtin \
                -dynamiclib \
                -nostdlib \
-               -lSystem \
                -current_version $(VERSION3) \
                -compatibility_version $(VERSION2) \
                -install_name $(LIBNAME)$(EXTDLL) \
-               -Wl,-object_path_lto,$(OBJDIR)/lto.o
-LINKLIBS    := $(LINKLIBS)
+               -Wl,-object_path_lto,$(OBJDIR)/lto.o \
+               -Wl,-no_data_in_code_info \
+               -Wl,-no_function_starts \
+               -Wl,-no_keep_dwarf_unwind \
+               -Wl,-no_compact_unwind
+LINKLIBS    := $(LINKLIBS) -lSystem
 RESO        := $(RESO)
 ifeq ($(TARGET_ARCH),x86)
 DEFINES     := $(DEFINES)
@@ -110,8 +120,10 @@ ifeq ($(TARGET_OS),linux)
 DEFINES   := $(DEFINES)
 INCLUDES  := $(INCLUDES)
 CXXFLAGS  := $(CXXFLAGS)
-LINKFLAGS := $(LINKFLAGS)
-LINKLIBS  := $(LINKLIBS)
+LINKFLAGS := $(LINKFLAGS) \
+             -nostdlib \
+             -Wl,--no-eh-frame-hdr
+LINKLIBS  := $(LINKLIBS) -lc
 RESO      := $(RESO)
 ifeq ($(TARGET_ARCH),x86)
 DEFINES   := $(DEFINES)
@@ -152,8 +164,14 @@ DEFINES   := $(DEFINES)
 CXXFLAGS  := $(CXXFLAGS)
 LINKFLAGS := $(LINKFLAGS) \
              -dynamiclib \
-             -install_name @rpath/$(LIBNAME)$(EXTDLL)
-LINKLIBS  := $(LINKLIBS)
+             -nostdlib \
+             -install_name @rpath/$(LIBNAME)$(EXTDLL) \
+             -Wl,-object_path_lto,$(OBJDIR)/lto.o \
+             -Wl,-no_data_in_code_info \
+             -Wl,-no_function_starts \
+             -Wl,-no_keep_dwarf_unwind \
+             -Wl,-no_compact_unwind
+LINKLIBS  := $(LINKLIBS) -lSystem
 RESO      := $(RESO)
 ifeq ($(TARGET_ARCH),x86)
 DEFINES   := $(DEFINES)

build/make/bin/ios-x64/.gitignore

@@ -0,0 +1 @@
+*

build/make/lib/ios-x64/.gitignore

@@ -0,0 +1 @@
+*

build/make/obj/ios-x64-debug/CppCore.Debug/.gitignore

@@ -0,0 +1 @@
+*

build/make/obj/ios-x64-debug/CppCore.Example.Client/.gitignore

@@ -0,0 +1 @@
+*

build/make/obj/ios-x64-debug/CppCore.Example.Server/.gitignore

@@ -0,0 +1 @@
+*

build/make/obj/ios-x64-debug/CppCore.Example.UI/.gitignore

@@ -0,0 +1 @@
+*

build/make/obj/ios-x64-debug/CppCore.Interface.C/.gitignore

@@ -0,0 +1 @@
+*

build/make/obj/ios-x64-debug/CppCore.Test/.gitignore

@@ -0,0 +1 @@
+*

build/make/obj/ios-x64-release/CppCore.Debug/.gitignore

@@ -0,0 +1 @@
+*

build/make/obj/ios-x64-release/CppCore.Example.Client/.gitignore

@@ -0,0 +1 @@
+*

build/make/obj/ios-x64-release/CppCore.Example.Server/.gitignore

@@ -0,0 +1 @@
+*

build/make/obj/ios-x64-release/CppCore.Example.UI/.gitignore

@@ -0,0 +1 @@
+*

build/make/obj/ios-x64-release/CppCore.Interface.C/.gitignore

@@ -0,0 +1 @@
+*

build/make/obj/ios-x64-release/CppCore.Test/.gitignore

@@ -0,0 +1 @@
+*

build/make/platforms/dist.mk

@@ -321,6 +321,8 @@ lib-dist: dist-prep lib-dist-x64 lib-dist-arm64
 	  $(DISTDIR)/$(NAME)/$(LIBNAME)$(EXTDLL)
 	@echo [INF] $(LIBNAME).dSYM
 	@dwarfdump --uuid $(DISTDIR)/$(NAME)/$(LIBNAME).dSYM
+	@echo [STR] $(LIBNAME)$(EXTDLL)
+	@$(STRIP) $(STRIPFLAGS) $(DISTDIR)/$(NAME)/$(LIBNAME)$(EXTDLL)
 	@echo [SIG] $(LIBNAME)$(EXTDLL)
 	@codesign --verbose \
 	  --sign "$(PUBLISHERCN)" \

build/make/platforms/linux-all-linux-arm.mk

@@ -18,7 +18,7 @@ ARFLAGS    = rcs
 STRIP      = llvm-strip
 STRIPFLAGS = --strip-all
 LINK       = $(CXX)
-LINKFLAGS  = -target $(TARGET) -fuse-ld=lld -static-libstdc++ -static-libgcc -fno-strict-aliasing
+LINKFLAGS  = -target $(TARGET) -fuse-ld=lld -fno-strict-aliasing
 LINKPATH   = 
 LINKLIBS   = 
 DEBARCH    = armhf
@@ -39,8 +39,8 @@ endif
 # Debug vs. Release
 ifeq ($(MODE),release)
 DEFINES   := $(DEFINES) -DNDEBUG
-CXXFLAGS  := $(CXXFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer
-CFLAGS    := $(CFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer
+CXXFLAGS  := $(CXXFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-plt
+CFLAGS    := $(CFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-plt
 LINKFLAGS := $(LINKFLAGS) -flto=thin -O3 -g -Wl,--gc-sections -Wl,--as-needed -fomit-frame-pointer
 else
 DEFINES   := $(DEFINES) -D_DEBUG

build/make/platforms/linux-all-linux-arm64.mk

@@ -18,7 +18,7 @@ ARFLAGS    = rcs
 STRIP      = llvm-strip
 STRIPFLAGS = --strip-all
 LINK       = $(CXX)
-LINKFLAGS  = -target $(TARGET) -fuse-ld=lld -static-libstdc++ -static-libgcc -fno-strict-aliasing
+LINKFLAGS  = -target $(TARGET) -fuse-ld=lld -fno-strict-aliasing
 LINKPATH   = 
 LINKLIBS   = 
 DEBARCH    = arm64
@@ -39,8 +39,8 @@ endif
 # Debug vs. Release
 ifeq ($(MODE),release)
 DEFINES   := $(DEFINES) -DNDEBUG
-CXXFLAGS  := $(CXXFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer
-CFLAGS    := $(CFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer
+CXXFLAGS  := $(CXXFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-plt
+CFLAGS    := $(CFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-plt
 LINKFLAGS := $(LINKFLAGS) -flto=thin -O3 -g -Wl,--gc-sections -Wl,--as-needed -fomit-frame-pointer
 else
 DEFINES   := $(DEFINES) -D_DEBUG

build/make/platforms/linux-all-linux-x64.mk

@@ -18,7 +18,7 @@ ARFLAGS    = rcs
 STRIP      = llvm-strip
 STRIPFLAGS = --strip-all
 LINK       = $(CXX)
-LINKFLAGS  = -target $(TARGET) -fuse-ld=lld -static-libstdc++ -static-libgcc -fno-strict-aliasing
+LINKFLAGS  = -target $(TARGET) -fuse-ld=lld -fno-strict-aliasing
 LINKPATH   =
 LINKLIBS   = 
 DEBARCH    = amd64
@@ -52,8 +52,8 @@ endif
 # Debug vs. Release
 ifeq ($(MODE),release)
 DEFINES   := $(DEFINES) -DNDEBUG
-CXXFLAGS  := $(CXXFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer
-CFLAGS    := $(CFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer
+CXXFLAGS  := $(CXXFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-plt
+CFLAGS    := $(CFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-plt
 LINKFLAGS := $(LINKFLAGS) -flto=thin -O3 -g -Wl,--gc-sections -Wl,--as-needed -fomit-frame-pointer
 else
 DEFINES   := $(DEFINES) -D_DEBUG

build/make/platforms/linux-all-linux-x86.mk

@@ -18,7 +18,7 @@ ARFLAGS    = rcs
 STRIP      = llvm-strip
 STRIPFLAGS = --strip-all
 LINK       = $(CXX)
-LINKFLAGS  = -target $(TARGET) -fuse-ld=lld -static-libstdc++ -static-libgcc -fno-strict-aliasing
+LINKFLAGS  = -target $(TARGET) -fuse-ld=lld -fno-strict-aliasing
 LINKPATH   =
 LINKLIBS   = 
 DEBARCH    = i386

build/make/platforms/osx-all-ios-arm64.mk

@@ -44,8 +44,8 @@ endif
 # Debug vs. Release
 ifeq ($(MODE),release)
 DEFINES   := $(DEFINES) -DNDEBUG
-CXXFLAGS  := $(CXXFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer
-CFLAGS    := $(CFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer
+CXXFLAGS  := $(CXXFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-plt
+CFLAGS    := $(CFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-plt
 LINKFLAGS := $(LINKFLAGS) -flto=thin -O3 -g -dead_strip -dead_strip_dylibs -fomit-frame-pointer
 else
 DEFINES   := $(DEFINES) -D_DEBUG

build/make/platforms/osx-all-ios-x64.mk

@@ -0,0 +1,40 @@
+# Generic
+EXTBIN     = 
+EXTLIB     = .a
+EXTDLL     = .dylib
+EXTPDB     = .pdb
+OBJDIR     = obj/ios-x64-$(MODE)
+LIBDIR     = lib/ios-x64
+BINDIR     = bin/ios-x64
+DISTDIR    = ../../dist/ios-13.0
+TARGET     = x86_64-apple-ios13.0-simulator
+MINVER     = -miphoneos-version-min=13.0
+CPUFLAGS   = -march=x86-64-v2 -mtune=generic -mpclmul
+SDKROOT    = $(shell xcrun --sdk iphonesimulator --show-sdk-path)
+DEFINES    = 
+INCLUDES   = 
+CXX        = clang++
+CXXFLAGS   = $(MINVER) -target $(TARGET) -isysroot $(SDKROOT) -static -fno-strict-aliasing
+CC         = clang
+CFLAGS     = $(MINVER) -target $(TARGET) -isysroot $(SDKROOT) -static -fno-strict-aliasing
+AR         = ar
+ARFLAGS    = rcs
+STRIP      = strip
+STRIPFLAGS = -S
+LINK       = $(CXX)
+LINKFLAGS  = $(MINVER) -target $(TARGET) -isysroot $(SDKROOT) -fno-strict-aliasing
+LINKPATH   =
+LINKLIBS   = 
+
+# Debug vs. Release
+ifeq ($(MODE),release)
+DEFINES   := $(DEFINES) -DNDEBUG
+CXXFLAGS  := $(CXXFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-plt
+CFLAGS    := $(CFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-plt
+LINKFLAGS := $(LINKFLAGS) -flto=thin -O3 -g -dead_strip -dead_strip_dylibs -fomit-frame-pointer
+else
+DEFINES   := $(DEFINES) -D_DEBUG
+CXXFLAGS  := $(CXXFLAGS) -Og -g3
+CFLAGS    := $(CFLAGS) -Og -g3
+LINKFLAGS := $(LINKFLAGS) -g3
+endif

build/make/platforms/osx-all-osx-arm64.mk

@@ -38,8 +38,8 @@ endif
 # Debug vs. Release
 ifeq ($(MODE),release)
 DEFINES   := $(DEFINES) -DNDEBUG
-CXXFLAGS  := $(CXXFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer
-CFLAGS    := $(CFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer
+CXXFLAGS  := $(CXXFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-plt
+CFLAGS    := $(CFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-plt
 LINKFLAGS := $(LINKFLAGS) -flto=thin -O3 -g -dead_strip -dead_strip_dylibs -fomit-frame-pointer
 else
 DEFINES   := $(DEFINES) -D_DEBUG

build/make/platforms/osx-all-osx-x64.mk

@@ -59,8 +59,8 @@ endif
 # Debug vs. Release
 ifeq ($(MODE),release)
 DEFINES   := $(DEFINES) -DNDEBUG
-CXXFLAGS  := $(CXXFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer
-CFLAGS    := $(CFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer
+CXXFLAGS  := $(CXXFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-plt
+CFLAGS    := $(CFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-plt
 LINKFLAGS := $(LINKFLAGS) -flto=thin -O3 -g -dead_strip -dead_strip_dylibs -fomit-frame-pointer
 else
 DEFINES   := $(DEFINES) -D_DEBUG

build/make/platforms/win-all-win-arm64.mk

@@ -8,12 +8,12 @@ LIBDIR     = lib/win-arm64
 BINDIR     = bin/win-arm64
 DISTDIR    = ../../dist/win-10
 TARGET     = aarch64-pc-windows-msvc
-DEFINES    = -DWIN32 -DWIN64 -D_MT
+DEFINES    = -DWIN32 -DWIN64
 INCLUDES   = 
 CXX        = clang++
-CXXFLAGS   = -target $(TARGET) -static -fno-strict-aliasing
+CXXFLAGS   = -target $(TARGET) -fno-strict-aliasing
 CC         = clang
-CFLAGS     = -target $(TARGET) -static -fno-strict-aliasing
+CFLAGS     = -target $(TARGET) -fno-strict-aliasing
 AR         = llvm-ar
 ARFLAGS    = rcs
 STRIP      = llvm-strip
@@ -41,14 +41,14 @@ endif
 # Debug vs. Release
 ifeq ($(MODE),release)
 DEFINES   := $(DEFINES) -DNDEBUG
-CXXFLAGS  := $(CXXFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer
-CFLAGS    := $(CFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer
+CXXFLAGS  := $(CXXFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-plt
+CFLAGS    := $(CFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-plt
 LINKFLAGS := $(LINKFLAGS) -flto=thin -O3 -g -o optimized.bc -fomit-frame-pointer -RELEASE \
-             -Xlinker /OPT:ref \
-             -Xlinker /OPT:icf \
+             -Xlinker /OPT:REF \
+             -Xlinker /OPT:ICF=3 \
              -Xlinker /DEBUG:FULL \
              -Xlinker /MANIFEST:EMBED
-LINKLIBS  := $(LINKLIBS) -llibcmt.lib
+LINKLIBS  := $(LINKLIBS)
 else
 DEFINES   := $(DEFINES) -D_DEBUG
 CXXFLAGS  := $(CXXFLAGS) -Og -g3 -Xclang -MTd

build/make/platforms/win-all-win-x64.mk

@@ -8,12 +8,12 @@ LIBDIR     = lib/win-x64
 BINDIR     = bin/win-x64
 DISTDIR    = ../../dist/win-10
 TARGET     = x86_64-pc-windows-msvc
-DEFINES    = -DWIN32 -DWIN64 -D_MT
+DEFINES    = -DWIN32 -DWIN64
 INCLUDES   = 
 CXX        = clang++
-CXXFLAGS   = -target $(TARGET) -static -fno-strict-aliasing
+CXXFLAGS   = -target $(TARGET) -fno-strict-aliasing
 CC         = clang
-CFLAGS     = -target $(TARGET) -static -fno-strict-aliasing
+CFLAGS     = -target $(TARGET) -fno-strict-aliasing
 AR         = llvm-ar
 ARFLAGS    = rcs
 STRIP      = llvm-strip
@@ -42,14 +42,14 @@ endif
 # Debug vs. Release
 ifeq ($(MODE),release)
 DEFINES   := $(DEFINES) -DNDEBUG
-CXXFLAGS  := $(CXXFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer -Xclang -MT
-CFLAGS    := $(CFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer -Xclang -MT
+CXXFLAGS  := $(CXXFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-plt
+CFLAGS    := $(CFLAGS) -flto=thin -O3 -g -ffunction-sections -fdata-sections -fomit-frame-pointer -fno-plt
 LINKFLAGS := $(LINKFLAGS) -flto=thin -O3 -g -o optimized.bc -fomit-frame-pointer -RELEASE \
-             -Xlinker /OPT:ref \
-             -Xlinker /OPT:icf \
+             -Xlinker /OPT:REF \
+             -Xlinker /OPT:ICF=3 \
              -Xlinker /DEBUG:FULL \
              -Xlinker /MANIFEST:EMBED
-LINKLIBS  := $(LINKLIBS) -llibcmt.lib
+LINKLIBS  := $(LINKLIBS)
 else
 DEFINES   := $(DEFINES) -D_DEBUG
 CXXFLAGS  := $(CXXFLAGS) -Og -g3 -Xclang -MTd