diff options
| author | Robin Watts <robin.watts@artifex.com> | 2016-11-15 17:41:15 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2016-11-15 18:30:57 +0000 |
| commit | 0c28c2aad6bfebf436c13a06db70413166d15d6d (patch) | |
| tree | f19d3465c12b572ebb283cdb4748149e0adade07 /platform/win32 | |
| parent | e84b0b0354a7ecf474600f55e1799d72affc2dfd (diff) | |
| download | mupdf-0c28c2aad6bfebf436c13a06db70413166d15d6d.tar.xz | |
Update JNI code to load 32 or 64 bit DLL as appropriate.
Make the JNI code detect whether it is running on a 32 or
64 bit machine, and change the name of the DLL appropriately.
Update Android Makefile to make mupdf_java32 instead of mupdf_java.
Update Java Makefile to make mupdf_java32 or mupdf_java64 based
on the system it is running on. This choice can be overruled by
defining BITS to be "32" or "64" before calling make.
Update Windows Solution to make mupdf_java32 or mupdf_java64 as
appropriate.
Diffstat (limited to 'platform/win32')
| -rw-r--r-- | platform/win32/javaviewerlib.vcproj | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/platform/win32/javaviewerlib.vcproj b/platform/win32/javaviewerlib.vcproj index 1af255e0..4a829c27 100644 --- a/platform/win32/javaviewerlib.vcproj +++ b/platform/win32/javaviewerlib.vcproj @@ -64,6 +64,7 @@ /> <Tool Name="VCLinkerTool" + OutputFile="$(OutDir)\$(ProjectName)32.dll" LinkIncremental="2" GenerateDebugInformation="true" SubSystem="2" @@ -141,6 +142,7 @@ /> <Tool Name="VCLinkerTool" + OutputFile="$(OutDir)\$(ProjectName)64.dll" LinkIncremental="1" GenerateDebugInformation="true" SubSystem="2" @@ -215,6 +217,7 @@ /> <Tool Name="VCLinkerTool" + OutputFile="$(OutDir)\$(ProjectName)32.dll" LinkIncremental="1" GenerateDebugInformation="true" SubSystem="2" @@ -292,6 +295,7 @@ /> <Tool Name="VCLinkerTool" + OutputFile="$(OutDir)\$(ProjectName)64.dll" LinkIncremental="1" GenerateDebugInformation="true" SubSystem="2" |