mirror of
https://github.com/corda/corda.git
synced 2025-01-01 02:36:44 +00:00
fix MSVC build
This commit is contained in:
parent
c5ef39f2bd
commit
999e90c332
3
makefile
3
makefile
@ -478,7 +478,8 @@ ifdef msvc
|
||||
-DUSE_ATOMIC_OPERATIONS -DAVIAN_JAVA_HOME=\"$(javahome)\" \
|
||||
-DAVIAN_EMBED_PREFIX=\"$(embed-prefix)\" \
|
||||
-Fd$(build)/$(name).pdb -I"$(zlib)/include" -I$(src) -I"$(build)" \
|
||||
-I"$(windows-java-home)/include" -I"$(windows-java-home)/include/win32"
|
||||
-I"$(windows-java-home)/include" -I"$(windows-java-home)/include/win32" \
|
||||
-DTARGET_BYTES_PER_WORD=$(pointer-size) -DTARGET_PLATFORM_WINDOWS
|
||||
shared = -dll
|
||||
lflags = -nologo -LIBPATH:"$(zlib)/lib" -DEFAULTLIB:ws2_32 \
|
||||
-DEFAULTLIB:zlib -MANIFEST -debug
|
||||
|
@ -56,10 +56,12 @@ typedef unsigned __int64 uint64_t;
|
||||
# ifdef _M_IX86
|
||||
typedef int32_t intptr_t;
|
||||
typedef uint32_t uintptr_t;
|
||||
# define UINT64_C(x) x##LL
|
||||
# define ARCH_x86_32
|
||||
# elif defined _M_X64
|
||||
typedef int64_t intptr_t;
|
||||
typedef uint64_t uintptr_t;
|
||||
# define UINT64_C(x) x##L
|
||||
# define ARCH_x86_64
|
||||
# else
|
||||
# error "unsupported architecture"
|
||||
|
@ -173,7 +173,7 @@ class Finder {
|
||||
virtual void dispose() = 0;
|
||||
};
|
||||
|
||||
Finder*
|
||||
JNIEXPORT Finder*
|
||||
makeFinder(System* s, Allocator* a, const char* path, const char* bootLibrary);
|
||||
|
||||
Finder*
|
||||
|
@ -3884,10 +3884,10 @@ errorLog(Thread* t)
|
||||
|
||||
} // namespace vm
|
||||
|
||||
void
|
||||
JNIEXPORT void
|
||||
vmPrintTrace(vm::Thread* t);
|
||||
|
||||
void*
|
||||
JNIEXPORT void*
|
||||
vmAddressFromLine(vm::Thread* t, vm::object m, unsigned line);
|
||||
|
||||
#endif//MACHINE_H
|
||||
|
@ -199,7 +199,7 @@ assert(System* s, bool v)
|
||||
|
||||
#endif // not NDEBUG
|
||||
|
||||
System*
|
||||
JNIEXPORT System*
|
||||
makeSystem(const char* crashDumpDirectory);
|
||||
|
||||
} // namespace vm
|
||||
|
Loading…
Reference in New Issue
Block a user