diff --git a/build-windows.xml b/build-windows.xml index 06cba8fa66..9eb85a06c4 100644 --- a/build-windows.xml +++ b/build-windows.xml @@ -83,16 +83,21 @@ - - - - + + + + + + - - + + + + + @@ -108,19 +113,23 @@ - - - - + + + + + - - + + + + + - + diff --git a/docs/doxygen/native_libs.dox b/docs/doxygen/native_libs.dox index 91e4e319fa..9a8dda376a 100644 --- a/docs/doxygen/native_libs.dox +++ b/docs/doxygen/native_libs.dox @@ -16,4 +16,6 @@ Autopsy has two types of native libraries: The libraries that libtsk_jni depends on are launched by Autopsy in the Installer.loadDynLibraries() method. This is because if we wait until libtsk_jni needs them, then they will be located based on Windows search paths and the NetBeans paths are not in that set. So, we launch them before libtsk_jni needs them and from within Autopsy so that it uses the Autopsy search pathes. +There is code in build-windows.xml and build-unix.xml to copy the external libraries into their respective locations when a ZIP package is made of the program. These libraries must be accessible via normal launching methods when developing Autopsy (i.e. we only copy them into the Autopsy structure when building the ZIP). + */ diff --git a/thirdparty/crt/update.bat b/thirdparty/crt/update.bat new file mode 100644 index 0000000000..fd1c6daec2 --- /dev/null +++ b/thirdparty/crt/update.bat @@ -0,0 +1,7 @@ +REM Updates the 32-bit and 64-bit VS Runtime dlls +REM Needs to be run from a 64-bit command prompt +REM Otherwise Windows will put 32-bit dlls in system32 +copy c:\windows\system32\msvcr100.dll win64 +copy c:\windows\system32\msvcp100.dll win64 +copy c:\windows\sysWoW64\msvcr100.dll win32 +copy c:\windows\sysWow64\msvcp100.dll win32 diff --git a/thirdparty/crt/win32/crt.zip b/thirdparty/crt/win32/crt.zip deleted file mode 100755 index a771033d47..0000000000 Binary files a/thirdparty/crt/win32/crt.zip and /dev/null differ diff --git a/thirdparty/crt/win32/msvcp100.dll b/thirdparty/crt/win32/msvcp100.dll new file mode 100755 index 0000000000..8502dfae5e Binary files /dev/null and b/thirdparty/crt/win32/msvcp100.dll differ diff --git a/thirdparty/crt/win32/msvcr100.dll b/thirdparty/crt/win32/msvcr100.dll new file mode 100755 index 0000000000..3e82b1aeac Binary files /dev/null and b/thirdparty/crt/win32/msvcr100.dll differ diff --git a/thirdparty/crt/win64/crt.zip b/thirdparty/crt/win64/crt.zip deleted file mode 100755 index a22a29a142..0000000000 Binary files a/thirdparty/crt/win64/crt.zip and /dev/null differ diff --git a/thirdparty/crt/win64/msvcp100.dll b/thirdparty/crt/win64/msvcp100.dll new file mode 100755 index 0000000000..6f0cdf160a Binary files /dev/null and b/thirdparty/crt/win64/msvcp100.dll differ diff --git a/thirdparty/crt/win64/msvcr100.dll b/thirdparty/crt/win64/msvcr100.dll new file mode 100755 index 0000000000..b1c3a5e77c Binary files /dev/null and b/thirdparty/crt/win64/msvcr100.dll differ