diff options
| author | lloyd <[email protected]> | 2009-11-23 16:17:03 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-11-23 16:17:03 +0000 |
| commit | 09a811f05119434dc77677d467b966438e99f218 (patch) | |
| tree | fb43ca6dacb03cdabfeef8e9793924b95beb77b6 | |
| parent | 70b855c84855aa33ab8411d24b9dd0b78ecbffcb (diff) | |
Fix the Nmake file - turns out the LIB is a really bad name for a variable
in nmake, causes strange linker errors without any obvious cause.
| -rw-r--r-- | src/build-data/makefile/nmake.in | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in index 7b7d2285b..79b80745c 100644 --- a/src/build-data/makefile/nmake.in +++ b/src/build-data/makefile/nmake.in @@ -47,10 +47,10 @@ CHECK_FLAGS = $(CHECK_OPT) $(LANG_FLAGS) $(WARN_FLAGS) LIBNAME = botan -LIBRARIES = $(LIB) +LIBRARIES = $(BOTAN_LIB) -# This will either be a static lib or the DLL linking lib -LIB = $(LIBNAME).%{static_suffix} +# This will be either a static lib or the DLL import lib +BOTAN_LIB = $(LIBNAME).%{static_suffix} all: $(LIBRARIES) @@ -61,10 +61,10 @@ all: $(LIBRARIES) ### Link Commands $(CHECK): $(LIBRARIES) $(CHECKOBJS) - $(CXX) /Fe$@ $(CHECKOBJS) $(STATIC_LIB) $(LINK_TO) + $(CXX) /Fe$@ $(CHECKOBJS) $(BOTAN_LIB) $(LINK_TO) -$(LIB): $(LIBOBJS) - $(LIB_LINK_CMD) /Febotan $(LIBOBJS) $(LINK_TO) +$(BOTAN_LIB): $(LIBOBJS) + $(LIB_LINK_CMD) /Fe$(LIBNAME) $(LIBOBJS) $(LINK_TO) ### Fake Targets clean: |