7 files changed, 21 insertions, 15 deletions
diff --git a/src/build-data/arch/amd64.txt b/src/build-data/arch/amd64.txt
index b0cf546d7..6b721805e 100644
--- a/src/build-data/arch/amd64.txt
+++ b/src/build-data/arch/amd64.txt
@@ -29,10 +29,12 @@ opteron -> k8
 amdopteron -> k8
 athlon64 -> k8
 barcelona -> k10
+
+corei5cpum520 -> westmere
 </submodel_aliases>
 
 <isa_extn>
 sse2:all
 ssse3:core2,nehalem,westmere
-aes_ni:westmere
+aes-ni:westmere
 </isa_extn>
diff --git a/src/build-data/botan.doxy.in b/src/build-data/botan.doxy.in
index 87d6e58eb..2f76a756b 100644
--- a/src/build-data/botan.doxy.in
+++ b/src/build-data/botan.doxy.in
@@ -13,7 +13,7 @@ BRIEF_MEMBER_DESC      = YES
 REPEAT_BRIEF           = YES
 ABBREVIATE_BRIEF       =
 ALWAYS_DETAILED_SEC    = NO
-INLINE_INHERITED_MEMB  = NO
+INLINE_INHERITED_MEMB  = YES
 FULL_PATH_NAMES        = YES
 STRIP_FROM_PATH        =
 STRIP_FROM_INC_PATH    =
@@ -21,7 +21,6 @@ SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = NO
 QT_AUTOBRIEF           = NO
 MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP         = NO
 INHERIT_DOCS           = YES
 SEPARATE_MEMBER_PAGES  = NO
 TAB_SIZE               = 8
@@ -40,7 +39,7 @@ TYPEDEF_HIDES_STRUCT   = NO
 EXTRACT_ALL            = YES
 EXTRACT_PRIVATE        = NO
 EXTRACT_STATIC         = NO
-EXTRACT_LOCAL_CLASSES  = YES
+EXTRACT_LOCAL_CLASSES  = NO
 EXTRACT_LOCAL_METHODS  = NO
 EXTRACT_ANON_NSPACES   = NO
 HIDE_UNDOC_MEMBERS     = NO
@@ -69,7 +68,7 @@ FILE_VERSION_FILTER    =
 #---------------------------------------------------------------------------
 QUIET                  = YES
 WARNINGS               = YES
-WARN_IF_UNDOCUMENTED   = NO
+WARN_IF_UNDOCUMENTED   = YES
 WARN_IF_DOC_ERROR      = YES
 WARN_NO_PARAMDOC       = NO
 WARN_FORMAT            = "$file:$line: $text"
@@ -83,7 +82,7 @@ FILE_PATTERNS          =
 RECURSIVE              = YES
 EXCLUDE                =
 EXCLUDE_SYMLINKS       = NO
-EXCLUDE_PATTERNS       =
+EXCLUDE_PATTERNS       = */wrap/*
 EXCLUDE_SYMBOLS        =
 EXAMPLE_PATH           =
 EXAMPLE_PATTERNS       =
diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in
index 90d274d58..6a203234a 100644
--- a/src/build-data/buildh.in
+++ b/src/build-data/buildh.in
@@ -8,6 +8,8 @@
 #define BOTAN_VERSION_MINOR %{version_minor}
 #define BOTAN_VERSION_PATCH %{version_patch}
 
+#define BOTAN_VERSION_DATESTAMP %{version_datestamp}
+
 #ifndef BOTAN_DLL
   #define BOTAN_DLL %{dll_import_flags}
 #endif
@@ -15,6 +17,7 @@
 /* Chunk sizes */
 #define BOTAN_DEFAULT_BUFFER_SIZE 4096
 #define BOTAN_MEM_POOL_CHUNK_SIZE 64*1024
+#define BOTAN_BLOCK_CIPHER_PAR_MULT 4
 
 /* BigInt toggles */
 #define BOTAN_MP_WORD_BITS %{mp_bits}
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index d133065a8..ebb239c86 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -10,7 +10,7 @@ add_lib_option -l
 
 lang_flags "-ansi -std=c++0x"
 #warning_flags "-W -Wall"
-warning_flags "-Werror -Wextra -Wall -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wno-unused-parameter -Wpointer-arith -Wcast-qual"
+warning_flags "-Werror -Wextra -Wall -Wstrict-aliasing -Wstrict-overflow=5 -Wcast-align -Wmissing-declarations -Wpointer-arith -Wcast-qual"
 
 lib_opt_flags "-O3"
 check_opt_flags "-O2"
@@ -29,7 +29,7 @@ default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)"
 # AIX doesn't seem to have soname support (weird...)
 aix     -> "$(CXX) -shared -fPIC"
 
-darwin  -> "$(CXX) -dynamiclib -fPIC -install_name $(SONAME)"
+darwin  -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME)"
 hpux    -> "$(CXX) -shared -fPIC -Wl,+h,$(SONAME)"
 solaris -> "$(CXX) -shared -fPIC -Wl,-h,$(SONAME)"
 # Gotta use ld directly on BeOS, their GCC is busted
diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt
index 273f1c5c0..24d91b3f3 100644
--- a/src/build-data/cc/msvc.txt
+++ b/src/build-data/cc/msvc.txt
@@ -11,7 +11,7 @@ add_lib_option ""
 no_debug_flags "/O2"
 debug_flags "/Od /Zi /DDEBUG"
 check_opt_flags "/O2 /D_CONSOLE"
-lang_flags "/EHsc /GR"
+lang_flags "/EHs /GR"
 warning_flags "/W3 /wd4275"
 
 shared_flags "/DBOTAN_DLL=__declspec(dllexport)"
diff --git a/src/build-data/innosetup.in b/src/build-data/innosetup.in
index c3e0f1ebd..0a7eeb8f6 100644
--- a/src/build-data/innosetup.in
+++ b/src/build-data/innosetup.in
@@ -8,12 +8,16 @@ AppPublisher=Jack Lloyd
 AppPublisherURL=http://botan.randombit.net/
 AppVersion=%{version}
 
-VersionInfoCopyright=Copyright (C) 1999-2009 Jack Lloyd and others
+VersionInfoCopyright=Copyright (C) 1999-2010 Jack Lloyd and others
 VersionInfoVersion=%{version_major}.%{version_minor}.%{version_patch}.0
 
 ; Require at least Windows 98 or 2000
 MinVersion=4.1,5.0
 
+; Uncomment for 64 bit builds
+;ArchitecturesAllowed = x64
+;ArchitecturesInstallIn64BitMode = x64
+
 DefaultDirName={pf}\botan
 DefaultGroupName=botan
 
diff --git a/src/build-data/makefile/nmake.in b/src/build-data/makefile/nmake.in
index 212825131..9928f3d4e 100644
--- a/src/build-data/makefile/nmake.in
+++ b/src/build-data/makefile/nmake.in
@@ -15,10 +15,6 @@ VERSION       = %{version}
 ### Installation Settings
 DESTDIR       = %{prefix}
 
-LIBDIR        = $(DESTDIR)\%{libdir}
-HEADERDIR     = $(DESTDIR)\%{includedir}\botan
-DOCDIR        = $(DESTDIR)\%{docdir}\botan-$(VERSION)
-
 ### Aliases for Common Programs
 AR            = %{ar_command}
 CD            = @cd
@@ -86,4 +82,6 @@ distclean: clean
 
 ### Install Commands
 install: $(LIBRARIES)
-	$(ECHO) "Install command not implemented"
+	-$(MKDIR) $(DESTDIR)\include\botan
+	$(INSTALL_CMD) botan.* $(DESTDIR)
+	$(INSTALL_CMD) build\include\botan\*.h $(DESTDIR)\include\botan