Download as
Browse Code »

Commit c79404016766d33dab2af56418b19e08c6b0a89c

Authored by perry.werneck@gmail.com
1 parent 70b5050b
Exists in master and in 5 other branches develop, edit-header-bar, keypads, script-support, v5.2

Ajustes para compilação em windows

Showing 6 changed files with 23 additions and 11 deletions   Show diff stats
configure.ac
  Diff comments   View file @c794040
... ... @@ -420,7 +420,7 @@ fi
420 420 # Java link options depends on OS
421 421 case "$host" in
422 422 *-mingw32)
423   - jvm_libs="-L\$(JVMDIR) -Wl,-rpath,\$(JVMDIR) -ljvm"
  423 + jvm_libs="-L\"\$(JRE_HOME)/bin/client\" -ljvm"
424 424 ;;
425 425  
426 426 *-apple-*)
... ... @@ -724,6 +724,7 @@ if test "$app_cv_registry" == "yes"; then
724 724 AC_DEFINE(HAVE_WIN_REGISTRY)
725 725 fi
726 726  
  727 +AC_SUBST()
727 728 AC_SUBST(MAJOR_VERSION,"$(echo $VERSION | cut -d. -f1)")
728 729 AC_SUBST(HOST_CC)
729 730 AC_SUBST(EXEEXT)
... ...
src/classlib/Makefile.in
  Diff comments   View file @c794040
... ... @@ -127,4 +127,4 @@ clean:
127 127 @rm -fr $(OBJDIR)
128 128 @rm -fr $(BINDIR)
129 129 @rm -f testprogram
130   - @find . -name "*~" -exec rm -f {} \;
  130 +
... ...
src/include/plugin.mak.in
  Diff comments   View file @c794040
... ... @@ -140,4 +140,4 @@ clean:
140 140 @rm -fr $(OBJDIR)
141 141 @rm -fr $(BINDIR)
142 142 @rm -f testprogram@EXEEXT@
143   - @find . -name "*~" -exec rm -f {} \;
  143 +
... ...
src/java/Makefile.in
  Diff comments   View file @c794040
... ... @@ -80,13 +80,13 @@ include $(CLASSLIBDIR)/class.mak
80 80  
81 81 CXXFLAGS=@CFLAGS@ @CXXFLAGS@ @DLL_CFLAGS@ @JNI_CPPFLAGS@ -I../include
82 82  
83   -PW3270_LIBS ?= -L../../.bin/Debug@DLLDIR@ -l3270 -lpw3270
  83 +# PW3270_LIBS ?= -L../../.bin/Debug@DLLDIR@ -l3270 -lpw3270
84 84 PW3270_CFLAGS ?= -I../include
85 85  
86 86 PLUGIN_CFLAGS=@CXXFLAGS@ @DLL_CFLAGS@ @JNI_CPPFLAGS@ -DJNIDIR="\"$(jnidir)\"" \
87 87 -DJARDIR="\"$(jvmjardir)\"" @GTK_CFLAGS@ @GTKMAC_CFLAGS@ $(PW3270_CFLAGS)
88 88  
89   -PLUGIN_LIBS=@GTK_LIBS@ @GTKMAC_LIBS@ $(PW3270_LIBS) @JVM_LIBS@
  89 +PLUGIN_LIBS=@GTK_LIBS@ @GTKMAC_LIBS@ @JVM_LIBS@
90 90  
91 91 #---[ Rules ]------------------------------------------------------------------
92 92  
... ... @@ -197,7 +197,12 @@ $(BINRLS)/plugins/j3270@DLLEXT@: \
197 197  
198 198 @echo " LD `basename $@`"
199 199 @$(MKDIR) `dirname $@`
200   - @$(CXX) @SYSDLL_FLAGS@ -Wl,--rpath,$(jnidir) $(LDFLAGS) -Wl,-soname,`basename $@` -o $@ $^ $(CLASS_LIBS) $(PLUGIN_LIBS) -L$(BINRLS)@DLLDIR@ -ljni3270
  200 + @$(CXX) @SYSDLL_FLAGS@ \
  201 + -Wl,--rpath,$(jnidir) $(LDFLAGS) -Wl,-soname,`basename $@` \
  202 + -o $@ $^ \
  203 + $(CLASS_LIBS) \
  204 + $(PLUGIN_LIBS) \
  205 + -L../../.bin/Release@DLLDIR@ -l3270 -lpw3270 \
201 206  
202 207 #---[ Debug targets ]----------------------------------------------------------
203 208  
... ... @@ -219,7 +224,14 @@ $(BINDBG)/plugins/j3270@DLLEXT@: \
219 224  
220 225 @echo " LD `basename $@`"
221 226 @$(MKDIR) `dirname $@`
222   - @$(CXX) @SYSDLL_FLAGS@ -Wl,--rpath,.bin/Debug@DLLDIR@ $(LDFLAGS) -Wl,-soname,`basename $@` -o $@ $^ $(CLASS_LIBS) $(PLUGIN_LIBS) -L$(BINDBG)@DLLDIR@ -ljni3270
  227 +
  228 + @$(CXX) @SYSDLL_FLAGS@ \
  229 + -Wl,--rpath,.bin/Debug@DLLDIR@ $(LDFLAGS) -Wl,-soname,`basename $@` \
  230 + -o $@ $^ \
  231 + $(CLASS_LIBS) \
  232 + $(PLUGIN_LIBS) \
  233 + -L../../.bin/Debug@DLLDIR@ -l3270 -lpw3270 \
  234 + -L$(BINDBG)@DLLDIR@ -ljni3270
223 235  
224 236 run: $(BINDBG)@DLLDIR@/@DLLPREFIX@jni3270@DLLEXT@ $(BINDIR)/java/testprogram.class
225 237 @LD_LIBRARY_PATH=../../.bin/Debug@DLLDIR@/ java -Djava.library.path=$(BINDBG)@DLLDIR@ -cp .bin/java/ testprogram
... ...
src/java/plugin.cc
  Diff comments   View file @c794040
... ... @@ -415,10 +415,9 @@ extern "C" {
415 415 g_mkdir_with_parents(exports,0777);
416 416  
417 417 lib3270_trace_event(v3270_get_session(widget),"java.class.path=%s;%s",dirname,exports);
418   - lib3270_trace_event(v3270_get_session(widget),"java.library.path=%s",myDIR);
  418 + lib3270_trace_event(v3270_get_session(widget),"java.library.path=%s",myDir);
419 419  
420   -
421   - options[vm_args.nOptions++].optionString = g_strdup_printf("-Djava.library.path=%s",myDIR);
  420 + options[vm_args.nOptions++].optionString = g_strdup_printf("-Djava.library.path=%s",myDir);
422 421 options[vm_args.nOptions++].optionString = g_strdup_printf("-Djava.class.path=%s;%s",dirname,exports);
423 422  
424 423 g_free(myDir);
... ...
src/plugins/dbus3270/Makefile.in
  Diff comments   View file @c794040
... ... @@ -162,4 +162,4 @@ clean:
162 162 @rm -fr $(BINDIR)
163 163 @rm -fr .tmp
164 164 @rm -f dbus-glue.h
165   - @find . -name "*~" -exec rm -f {} \;
  165 +
... ...