Download as
Browse Code »

Commit 2705a1d4d0f20dd46f5e5d040a934579592af44a

Authored by Perry Werneck
1 parent 69ab4e63
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

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
  Diff comments   View file @2705a1d
@@ -222,6 +222,7 @@ $(BINRLS)@DLLDIR@/@DLLPREFIX@jni3270@DLLEXT@: \ @@ -222,6 +222,7 @@ $(BINRLS)@DLLDIR@/@DLLPREFIX@jni3270@DLLEXT@: \
222 @$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) -Wl,-soname,`basename $@` -o $@ $^ $(CLASS_LIBS) @INTL_LIBS@ 222 @$(CXX) @SYSDLL_FLAGS@ $(LDFLAGS) -Wl,-soname,`basename $@` -o $@ $^ $(CLASS_LIBS) @INTL_LIBS@
223 223
224 $(BINRLS)/plugins/j3270@DLLEXT@: \ 224 $(BINRLS)/plugins/j3270@DLLEXT@: \
  225 + ../../.bin/Release@DLLDIR@/lib3270@DLLEXT@ \
225 $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/j3270/$(SRC)@OBJEXT@) \ 226 $(foreach SRC, $(basename $(PLUGIN_SRC)), $(OBJRLS)/j3270/$(SRC)@OBJEXT@) \
226 $(CLASS_RELEASE_OBJECTS) 227 $(CLASS_RELEASE_OBJECTS)
227 228
@@ -232,9 +233,12 @@ $(BINRLS)/plugins/j3270@DLLEXT@: \ @@ -232,9 +233,12 @@ $(BINRLS)/plugins/j3270@DLLEXT@: \
232 -o $@ $^ \ 233 -o $@ $^ \
233 $(CLASS_LIBS) \ 234 $(CLASS_LIBS) \
234 $(PLUGIN_LIBS) \ 235 $(PLUGIN_LIBS) \
235 - -L../../.bin/Release@DLLDIR@ -l3270 -lpw3270 \ 236 + -L../../.bin/Release@DLLDIR@ -l3270 \
236 -L$(BINRLS)@DLLDIR@ -ljni3270 237 -L$(BINRLS)@DLLDIR@ -ljni3270
237 238
  239 +../../.bin/Release@DLLDIR@/lib3270@DLLEXT@:
  240 + make -C ../.. .bin/Release@DLLDIR@/lib3270@DLLEXT@
  241 +
238 #---[ Debug targets ]---------------------------------------------------------- 242 #---[ Debug targets ]----------------------------------------------------------
239 243
240 Debug: $(BINDBG)@DLLDIR@/@DLLPREFIX@jni3270@DLLEXT@ \ 244 Debug: $(BINDBG)@DLLDIR@/@DLLPREFIX@jni3270@DLLEXT@ \
@@ -262,7 +266,7 @@ $(BINDBG)/plugins/j3270@DLLEXT@: \ @@ -262,7 +266,7 @@ $(BINDBG)/plugins/j3270@DLLEXT@: \
262 -o $@ $^ \ 266 -o $@ $^ \
263 $(CLASS_LIBS) \ 267 $(CLASS_LIBS) \
264 $(PLUGIN_LIBS) \ 268 $(PLUGIN_LIBS) \
265 - -L../../.bin/Debug@DLLDIR@ -l3270 -lpw3270 \ 269 + -L../../.bin/Debug@DLLDIR@ -l3270 \
266 -L$(BINDBG)@DLLDIR@ -ljni3270 270 -L$(BINDBG)@DLLDIR@ -ljni3270
267 271
268 run: \ 272 run: \