Commit 2705a1d4d0f20dd46f5e5d040a934579592af44a
1 parent
69ab4e63
Exists in
master
and in
5 other branches
Corrigindo empacotamento standalone do plugin java (Facilita geração em windows).
Showing
1 changed file
with
6 additions
and
2 deletions
Show diff stats
src/java/Makefile.in
| ... | ... | @@ -222,6 +222,7 @@ $(BINRLS)@DLLDIR@/@DLLPREFIX@jni3270@DLLEXT@: \ |
| 222 | 222 | @$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) -Wl,-soname,`basename $@` -o $@ $^ $(CLASS_LIBS) @INTL_LIBS@ |
| 223 | 223 | |
| 224 | 224 | $(BINRLS)/plugins/j3270@DLLEXT@: \ |
| 225 | + ../../.bin/Release@DLLDIR@/lib3270@DLLEXT@ \ | |
| 225 | 226 | $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/j3270/$(SRC)@OBJEXT@) \ |
| 226 | 227 | $(CLASS_RELEASE_OBJECTS) |
| 227 | 228 | |
| ... | ... | @@ -232,9 +233,12 @@ $(BINRLS)/plugins/j3270@DLLEXT@: \ |
| 232 | 233 | -o $@ $^ \ |
| 233 | 234 | $(CLASS_LIBS) \ |
| 234 | 235 | $(PLUGIN_LIBS) \ |
| 235 | - -L../../.bin/Release@DLLDIR@ -l3270 -lpw3270 \ | |
| 236 | + -L../../.bin/Release@DLLDIR@ -l3270 \ | |
| 236 | 237 | -L$(BINRLS)@DLLDIR@ -ljni3270 |
| 237 | 238 | |
| 239 | +../../.bin/Release@DLLDIR@/lib3270@DLLEXT@: | |
| 240 | + make -C ../.. .bin/Release@DLLDIR@/lib3270@DLLEXT@ | |
| 241 | + | |
| 238 | 242 | #---[ Debug targets ]---------------------------------------------------------- |
| 239 | 243 | |
| 240 | 244 | Debug: $(BINDBG)@DLLDIR@/@DLLPREFIX@jni3270@DLLEXT@ \ |
| ... | ... | @@ -262,7 +266,7 @@ $(BINDBG)/plugins/j3270@DLLEXT@: \ |
| 262 | 266 | -o $@ $^ \ |
| 263 | 267 | $(CLASS_LIBS) \ |
| 264 | 268 | $(PLUGIN_LIBS) \ |
| 265 | - -L../../.bin/Debug@DLLDIR@ -l3270 -lpw3270 \ | |
| 269 | + -L../../.bin/Debug@DLLDIR@ -l3270 \ | |
| 266 | 270 | -L$(BINDBG)@DLLDIR@ -ljni3270 |
| 267 | 271 | |
| 268 | 272 | run: \ | ... | ... |