ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-02-02 09:18:13 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix Windows OpenJDK build

Browse Source
This commit is contained in:
Joel Dice 2013-01-25 08:07:47 -07:00
parent 844520a402
commit 2131adf3aa
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/classpath-openjdk.cpp
View File

@ -46,7 +46,8 @@
# define O_RDONLY _O_RDONLY # define O_RDONLY _O_RDONLY
# ifdef AVIAN_OPENJDK_SRC # if (defined AVIAN_OPENJDK_SRC) \
|| ((defined __x86_64__) && (defined __MINGW32__))
# define EXPORT(x) x # define EXPORT(x) x
# else # else
# define EXPORT(x) _##x # define EXPORT(x) _##x
@ -450,9 +451,14 @@ class MyClasspath : public Classpath {
// todo: handle other architectures // todo: handle other architectures
# define LIB_DIR "/lib/i386" # define LIB_DIR "/lib/i386"
#endif #endif
#ifdef PLATFORM_WINDOWS
sb.append(LIB_DIR);
#else
sb.append(LIB_DIR ":"); sb.append(LIB_DIR ":");
sb.append(javaHome); sb.append(javaHome);
sb.append(LIB_DIR "/xawt"); sb.append(LIB_DIR "/xawt");
#endif
sb.append('\0'); sb.append('\0');
unsigned tzMappingsOffset = sb.offset; unsigned tzMappingsOffset = sb.offset;
@ -638,7 +644,9 @@ class MyClasspath : public Classpath {
#else // not AVIAN_OPENJDK_SRC #else // not AVIAN_OPENJDK_SRC
expect(t, loadLibrary(t, libraryPath, "verify", true, true)); expect(t, loadLibrary(t, libraryPath, "verify", true, true));
expect(t, loadLibrary(t, libraryPath, "java", true, true)); expect(t, loadLibrary(t, libraryPath, "java", true, true));
# ifndef PLATFORM_WINDOWS
loadLibrary(t, libraryPath, "mawt", true, true); loadLibrary(t, libraryPath, "mawt", true, true);
# endif
#endif // not AVIAN_OPENJDK_SRC #endif // not AVIAN_OPENJDK_SRC
{ object assertionLock = resolveField { object assertionLock = resolveField