Skip to content

Commit

Permalink
Win32: using -NODEFAULTLIB:libcmt only when linking with Oodle
Browse files Browse the repository at this point in the history
  • Loading branch information
@gildor2
gildor2 committed Jun 2, 2021
1 parent 115d6d7 commit ff21097
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
1 change: 0 additions & 1 deletion common.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@ OPTIONS += $WARNINGS
!if ("$OLDCRT" ne "1") && ("$COMPILER" eq "VisualC")
# Use static CRT for release Windows builds without use of MSVCRT.dll
LIBC = static
LINKFLAGS += -NODEFAULTLIB:libcmt
!endif
!endif

Expand Down
4 changes: 4 additions & 0 deletions libs/oodle/oodle.project
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,8 @@ OODLE_LIB_PATH=
LIBINCLUDES += $R/libs/oodle/include
LIBRARIES += $R/libs/oodle/$OODLE_LIB_PATH
STDLIBS += $OODLE_LIB_FILE
!if "$COMPILER" eq "VisualC"
# Ensure compatible CRT will be used when linking with Win32 Oodle static libraries
LINKFLAGS += -NODEFAULTLIB:libcmt
!endif
!endif

0 comments on commit ff21097

Please sign in to comment.