Commit d3eeece4c4904d977f1c2de8f7db7c7dd16870f3
1 parent
f38b36c5
Exists in
master
and in
5 other branches
Tentando corrigir geração do plugin java de acordo com sugestão em http://stacko…
…verflow.com/questions/16930567/undefined-reference-to-jni-createjavavm-windows
Showing
3 changed files
with
3 additions
and
9 deletions
Show diff stats
configure.ac
| ... | ... | @@ -132,11 +132,10 @@ case "$host" in |
| 132 | 132 | SOCKET_LIBS="-lws2_32" |
| 133 | 133 | CFLAGS="$CFLAGS -mms-bitfields" |
| 134 | 134 | localedir="locale" |
| 135 | - DLL_FLAGS="-shared -Wl,--add-stdcall-alias,--enable-stdcall-fixup" | |
| 136 | 135 | DLLPREFIX="" |
| 137 | 136 | |
| 138 | 137 | # http://stackoverflow.com/questions/18138635/mingw-exe-requires-a-few-gcc-dlls-regardless-of-the-code |
| 139 | - SYSDLL_FLAGS="-shared -static-libgcc -static-libstdc++ -Wl,--add-stdcall-alias,--enable-stdcall-fixup" | |
| 138 | + SYSDLL_FLAGS="-shared -static-libgcc -static-libstdc++ -Wl,--add-stdcall-alias,--enable-stdcall-fixup,--enable-auto-import" | |
| 140 | 139 | |
| 141 | 140 | LDSOFLAGS="-Wl,-soname,\`basename \$@\`" |
| 142 | 141 | LDAPPFLAGS="-mwindows" |
| ... | ... | @@ -409,7 +408,7 @@ fi |
| 409 | 408 | # Java link options depends on OS |
| 410 | 409 | case "$host" in |
| 411 | 410 | *-mingw32) |
| 412 | - jvm_libs="-L\"\$(JRE_HOME)/bin/client\" -ljvm" | |
| 411 | + jvm_libs="-L\"\$(JDK_HOME)/lib\" -ljvm" | |
| 413 | 412 | ;; |
| 414 | 413 | |
| 415 | 414 | *-apple-*) | ... | ... |
pw3270.cbp
| ... | ... | @@ -114,11 +114,6 @@ |
| 114 | 114 | <Option target="Debug" /> |
| 115 | 115 | <Option target="Release" /> |
| 116 | 116 | </Unit> |
| 117 | - <Unit filename="src/java/call.c"> | |
| 118 | - <Option compilerVar="CC" /> | |
| 119 | - <Option target="Debug" /> | |
| 120 | - <Option target="Release" /> | |
| 121 | - </Unit> | |
| 122 | 117 | <Unit filename="src/java/clipboard.cc"> |
| 123 | 118 | <Option target="Debug" /> |
| 124 | 119 | <Option target="Release" /> | ... | ... |
src/java/Makefile.in
| ... | ... | @@ -204,7 +204,7 @@ $(BINRLS)/plugins/j3270@DLLEXT@: \ |
| 204 | 204 | $(CLASS_LIBS) \ |
| 205 | 205 | $(PLUGIN_LIBS) \ |
| 206 | 206 | -L../../.bin/Release@DLLDIR@ -l3270 -lpw3270 \ |
| 207 | - -L$(BINDBG)@DLLDIR@ -ljni3270 | |
| 207 | + -L$(BINRLS)@DLLDIR@ -ljni3270 | |
| 208 | 208 | |
| 209 | 209 | #---[ Debug targets ]---------------------------------------------------------- |
| 210 | 210 | ... | ... |