fix MSVC build

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

View File

@ -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

View File

@ -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"

View File

@ -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*

View File

@ -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

View File

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