diff options
| author | Simon Warta <[email protected]> | 2015-07-02 18:35:05 +0200 |
|---|---|---|
| committer | Simon Warta <[email protected]> | 2015-07-21 20:06:18 +0200 |
| commit | f23eb642854eea76a84ca66c9f00e1e28cf0b58c (patch) | |
| tree | 513ecc0bc3c5ccb4e0494aebc1ce80979f37c2f0 | |
| parent | 648d504933e2fd3e994d24d8703fee9b176c36cd (diff) | |
msvc fixes
| -rw-r--r-- | src/build-data/makefile/nmake.in | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in index 9445063d9..3060b674d 100644 --- a/src/build-data/makefile/nmake.in +++ b/src/build-data/makefile/nmake.in @@ -20,8 +20,15 @@ TEST = %{out_dir}\botan-test%{program_suffix} # Library targets # LIB_FILENAME is either a static lib or the DLL LIB_BASENAME = %{libname} -LIB_FILENAME = %{out_dir}\$(LIB_BASENAME).%{static_suffix} +LIB_FILENAME = %{out_dir}\$(LIB_BASENAME).lib + +!If "$(SO_OBJ_FLAGS)" == "" LIBRARIES = $(LIB_FILENAME) +!Else +SHARED_LIB = %{out_dir}\$(LIB_BASENAME).dll +LIBRARIES = $(LIB_FILENAME) $(SHARED_LIB) +!Endif + # File Lists LIBOBJS = %{lib_objs} @@ -42,18 +49,19 @@ all: $(APP) $(TEST) # Link Commands $(APP): $(LIBRARIES) $(APPOBJS) - $(APP_LINK_CMD) /Fe$@ $(APPOBJS) $(LIB_FILENAME) $(APP_LINKS_TO) + $(APP_LINK_CMD) /OUT:$@ $(APPOBJS) $(LIB_FILENAME) $(APP_LINKS_TO) $(APP_POST_LINK_CMD) $(TEST): $(LIBRARIES) $(TESTOBJS) - $(TEST_LINK_CMD) /Fe$@ $(TESTOBJS) $(LIB_FILENAME) $(TEST_LINKS_TO) + $(TEST_LINK_CMD) /OUT:$@ $(TESTOBJS) $(LIB_FILENAME) $(TEST_LINKS_TO) $(TEST_POST_LINK_CMD) -$(LIB_FILENAME): $(LIBOBJS) !If "$(SO_OBJ_FLAGS)" == "" +$(LIB_FILENAME): $(LIBOBJS) $(AR) /OUT:$(LIB_FILENAME) $(LIBOBJS) !Else - $(LIB_LINK_CMD) /Fe%{out_dir}\$(LIB_BASENAME) $(LIBOBJS) $(LIB_LINKS_TO) +$(SHARED_LIB): $(LIBOBJS) + $(LIB_LINK_CMD) /OUT:$(LIB_FILENAME) $(LIBOBJS) $(LIB_LINKS_TO) !Endif # Fake Targets |