ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-01-06 05:04:20 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix MSVC build

Browse Source
This commit is contained in:
Joel Dice 2012-02-16 18:22:11 -07:00
parent c5ef39f2bd
commit 999e90c332
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
makefile
View File

@ -478,7 +478,8 @@ ifdef msvc
-DUSE_ATOMIC_OPERATIONS -DAVIAN_JAVA_HOME=\"$(javahome)\" \ -DUSE_ATOMIC_OPERATIONS -DAVIAN_JAVA_HOME=\"$(javahome)\" \
-DAVIAN_EMBED_PREFIX=\"$(embed-prefix)\" \ -DAVIAN_EMBED_PREFIX=\"$(embed-prefix)\" \
-Fd$(build)/$(name).pdb -I"$(zlib)/include" -I$(src) -I"$(build)" \ -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 shared = -dll
lflags = -nologo -LIBPATH:"$(zlib)/lib" -DEFAULTLIB:ws2_32 \ lflags = -nologo -LIBPATH:"$(zlib)/lib" -DEFAULTLIB:ws2_32 \
-DEFAULTLIB:zlib -MANIFEST -debug -DEFAULTLIB:zlib -MANIFEST -debug

2
src/common.h
View File

@ -56,10 +56,12 @@ typedef unsigned __int64 uint64_t;
# ifdef _M_IX86 # ifdef _M_IX86
typedef int32_t intptr_t; typedef int32_t intptr_t;
typedef uint32_t uintptr_t; typedef uint32_t uintptr_t;
# define UINT64_C(x) x##LL
# define ARCH_x86_32 # define ARCH_x86_32
# elif defined _M_X64 # elif defined _M_X64
typedef int64_t intptr_t; typedef int64_t intptr_t;
typedef uint64_t uintptr_t; typedef uint64_t uintptr_t;
# define UINT64_C(x) x##L
# define ARCH_x86_64 # define ARCH_x86_64
# else # else
# error "unsupported architecture" # error "unsupported architecture"

2
src/finder.h
View File

@ -173,7 +173,7 @@ class Finder {
virtual void dispose() = 0; virtual void dispose() = 0;
}; };
Finder* JNIEXPORT Finder*
makeFinder(System* s, Allocator* a, const char* path, const char* bootLibrary); makeFinder(System* s, Allocator* a, const char* path, const char* bootLibrary);
Finder* Finder*

4
src/machine.h
View File

@ -3884,10 +3884,10 @@ errorLog(Thread* t)
} // namespace vm } // namespace vm
void JNIEXPORT void
vmPrintTrace(vm::Thread* t); vmPrintTrace(vm::Thread* t);
void* JNIEXPORT void*
vmAddressFromLine(vm::Thread* t, vm::object m, unsigned line); vmAddressFromLine(vm::Thread* t, vm::object m, unsigned line);
#endif//MACHINE_H #endif//MACHINE_H

2
src/system.h
View File

@ -199,7 +199,7 @@ assert(System* s, bool v)
#endif // not NDEBUG #endif // not NDEBUG
System* JNIEXPORT System*
makeSystem(const char* crashDumpDirectory); makeSystem(const char* crashDumpDirectory);
} // namespace vm } // namespace vm