diff options
| author | lloyd <[email protected]> | 2014-01-10 00:08:13 +0000 |
|---|---|---|
| committer | lloyd <[email protected]> | 2014-01-10 00:08:13 +0000 |
| commit | 57789bdfc55061002b2727d0b32587612829a37c (patch) | |
| tree | 99f36631b4ec50c5187a1b0a7c256b99182373ad /src/build-data/makefile/nmake.in | |
| parent | 94968c917407a63d888fd3eb4d02491f60de6ebc (diff) | |
Split up test vectors into per-algo files and app into botan-test for
the tests and botan for everything else.
Diffstat (limited to 'src/build-data/makefile/nmake.in')
| -rw-r--r-- | src/build-data/makefile/nmake.in | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in index 392684214..413428803 100644 --- a/src/build-data/makefile/nmake.in +++ b/src/build-data/makefile/nmake.in @@ -1,15 +1,17 @@ ### Compiler Options CXX = %{cc} LIB_OPT = %{lib_opt} -APP_OPT = %{app_opt} +APP_OPT = %{app_opt} LANG_FLAGS = %{lang_flags} WARN_FLAGS = %{warn_flags} SO_OBJ_FLAGS = %{shared_flags} LIB_LINK_CMD = %{so_link} -LINK_TO = %{link_to} +APP_LINKS_TO = $(LIB_LINKS_TO) -lboost_thread +TEST_LINKS_TO = $(LIB_LINKS_TO) -lboost_filesystem LIB_FLAGS = $(LIB_OPT) $(LANG_FLAGS) $(WARN_FLAGS) $(SO_OBJ_FLAGS) -APP_FLAGS = $(APP_OPT) $(LANG_FLAGS) $(WARN_FLAGS) +APP_FLAGS = $(APP_OPT) $(LANG_FLAGS) $(WARN_FLAGS) +TEST_FLAGS = $(APP_OPT) $(LANG_FLAGS) $(WARN_FLAGS) ### Version Numbers VERSION = %{version} @@ -31,11 +33,14 @@ RM_R = $(RM) /S RMDIR = @rmdir ### File Lists -APP = botan +APP = botan +TEST = botan-test LIBOBJS = %{lib_objs} -APPOBJS = %{app_objs} +APPOBJS = %{app_objs} + +TESTOBJS = %{test_objs} LIBNAME = botan @@ -44,17 +49,22 @@ LIBRARIES = $(BOTAN_LIB) # This will be either a static lib or the DLL import lib BOTAN_LIB = $(LIBNAME).%{static_suffix} -all: $(APP) +all: $(APP) $(TEST) ### Build Commands %{lib_build_cmds} %{app_build_cmds} +%{test_build_cmds} + ### Link Commands $(APP): $(LIBRARIES) $(APPOBJS) $(CXX) /Fe$@ $(APPOBJS) $(BOTAN_LIB) $(LINK_TO) +$(TEST): $(LIBRARIES) $(TESTOBJS) + $(CXX) /Fe$@ $(TESTOBJS) $(BOTAN_LIB) $(LINK_TO) + $(BOTAN_LIB): $(LIBOBJS) !If "$(SO_OBJ_FLAGS)" == "" $(AR) /OUT:$(BOTAN_LIB) $(LIBOBJS) |