diff options
| author | lloyd <[email protected]> | 2010-06-10 15:00:40 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2010-06-10 15:00:40 +0000 |
| commit | 512a0ea86f59d8935013ce9eed9ab97e5cfdafa2 (patch) | |
| tree | f98eba13f1ff959b2cf3b722353e8437c90ce4dc /src | |
| parent | 468a7e412a78a214157502153fbf3d3910179d44 (diff) | |
Final DLL link fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/build-data/cc/msvc.txt | 4 | ||||
| -rw-r--r-- | src/build-data/makefile/nmake.in | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt index 934ab386d..7951b53f9 100644 --- a/src/build-data/cc/msvc.txt +++ b/src/build-data/cc/msvc.txt @@ -25,3 +25,7 @@ makefile_style nmake <so_link_flags> default -> "$(CXX) /LD" </so_link_flags> + +<mach_abi_linking> +all -> "/MD" +</mach_abi_linking> diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in index 3c774c2af..0946ec4c2 100644 --- a/src/build-data/makefile/nmake.in +++ b/src/build-data/makefile/nmake.in @@ -77,7 +77,7 @@ all: $(LIBRARIES) # $(CHECKOBJS),check.exe,,$(LINK_TO) $(STATIC_LIB) $(CHECK): $(LIBRARIES) $(CHECKOBJS) - link /OUT:[email protected] $(CHECKOBJS) $(STATIC_LIB) $(LINK_TO) + $(CXX) /Fe:$@ $(CHECKOBJS) $(STATIC_LIB) $(LINK_TO) $(STATIC_LIB): $(LIBOBJS) !If "$(SO_OBJ_FLAGS)" == "" |