diff options
| author | lloyd <[email protected]> | 2009-11-20 16:11:55 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2009-11-20 16:11:55 +0000 |
| commit | 8f966fab28227c7fb33136efc4ce7170f36c1523 (patch) | |
| tree | 16e7767f9aee08e6868a91686324e95e677f1fad /src/build-data/makefile | |
| parent | f31a7b20519016474a996554f418bdfd16dd5460 (diff) | |
Various fixes for Visual C++ per bug 63 - --enable-debug sets debug options,
--disable-shared disables DLL options, and don't define _CONSOLE in the
library build.
Diffstat (limited to 'src/build-data/makefile')
| -rw-r--r-- | src/build-data/makefile/nmake.in | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in index 2604a3459..7b7d2285b 100644 --- a/src/build-data/makefile/nmake.in +++ b/src/build-data/makefile/nmake.in @@ -6,7 +6,7 @@ MACH_OPT = %{mach_opt} LANG_FLAGS = %{lang_flags} WARN_FLAGS = %{warn_flags} SO_OBJ_FLAGS = %{shared_flags} -SO_LINK_CMD = %{so_link} +LIB_LINK_CMD = %{so_link} LINK_TO = %{link_to} ### Version Numbers @@ -45,11 +45,12 @@ CHECKOBJS = %{check_objs} LIB_FLAGS = $(LIB_OPT) $(MACH_OPT) $(LANG_FLAGS) $(WARN_FLAGS) $(SO_OBJ_FLAGS) CHECK_FLAGS = $(CHECK_OPT) $(LANG_FLAGS) $(WARN_FLAGS) -LIBRARIES = $(DLL) - LIBNAME = botan -DLL = $(LIBNAME).%{so_suffix} -STATIC_LIB = $(LIBNAME).%{static_suffix} + +LIBRARIES = $(LIB) + +# This will either be a static lib or the DLL linking lib +LIB = $(LIBNAME).%{static_suffix} all: $(LIBRARIES) @@ -62,8 +63,8 @@ all: $(LIBRARIES) $(CHECK): $(LIBRARIES) $(CHECKOBJS) $(CXX) /Fe$@ $(CHECKOBJS) $(STATIC_LIB) $(LINK_TO) -$(DLL): $(LIBOBJS) - $(SO_LINK_CMD) /Febotan $(LIBOBJS) $(LINK_TO) +$(LIB): $(LIBOBJS) + $(LIB_LINK_CMD) /Febotan $(LIBOBJS) $(LINK_TO) ### Fake Targets clean: |