Download as
Browse Code »

Commit 5be5dd07beac0039e3aa50e8aeb7a84490199af3

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

Ajustes para executar em macosx

Showing 5 changed files with 13 additions and 5 deletions   Show diff stats
Makefile.in
  Diff comments   View file @5be5dd0
... ... @@ -71,6 +71,7 @@ MSGFMT=@MSGFMT@
71 71 XML2POT=src/tools/xml2pot@EXEEXT@
72 72 SHELL=@SHELL@
73 73 AMTAR=@AMTAR@
  74 +DBGCMDPREFIX=@DBGCMDPREFIX@
74 75  
75 76 #---[ Rules ]------------------------------------------------------------------
76 77  
... ... @@ -157,7 +158,7 @@ $(BINDIR)/Debug@DLLDIR@/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib32
157 158 @$(MAKE) BINDBG=../../.bin/Debug@DLLDIR@ -C src/lib3270 ../../.bin/Debug@DLLDIR@/@DLLPREFIX@3270@DLLEXT@
158 159  
159 160 run: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png
160   - @PATH="$(BINDIR)/Debug@DLLDIR@:$(PATH)" "$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)"
  161 + @$(DBGCMDPREFIX) "$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)"
161 162  
162 163 memchk: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)
163 164 ifeq ($(VALGRIND),no)
... ...
configure.ac
  Diff comments   View file @5be5dd0
... ... @@ -104,7 +104,6 @@ DLLEXT=".so"
104 104 OBJEXT=".o"
105 105 EXEEXT=""
106 106 DLLPREFIX="lib"
107   -DLLDIR="/lib"
108 107  
109 108 if test $host != $build; then
110 109 AC_CHECK_PROGS(HOST_CC, gcc cc)
... ... @@ -122,6 +121,7 @@ case "$host" in
122 121 LDSOFLAGS="-Wl,-soname,\`basename \$@\`"
123 122 DBGRPATH=""
124 123 DLLDIR=""
  124 + DBGCMDPREFIX="PATH=\$(BINDIR)/Debug/lib:\$(PATH)"
125 125 AC_PATH_TOOL([STRIP], [strip])
126 126 ;;
127 127  
... ... @@ -129,13 +129,17 @@ case "$host" in
129 129 LDSOFLAGS=""
130 130 DLLDIR="/lib"
131 131 DBGRPATH=""
  132 + DBGCMDPREFIX="DYLD_LIBRARY_PATH=\$(BINDIR)/Debug/lib"
132 133 LDSOFLAGS="-Wl,-install_name,\`basename \$@\`"
133 134 ;;
134 135  
135 136 *)
136 137 LDSOFLAGS="-Wl,-soname,\`basename \$@\`"
  138 + DLLDIR="/lib"
137 139 DBGRPATH="-Wl,--rpath,.bin/Debug/lib"
  140 + DBGCMDPREFIX="PATH=\$(BINDIR)/Debug/lib:\$(PATH)"
138 141 AC_PATH_TOOL([STRIP], [strip])
  142 +
139 143  
140 144 esac
141 145  
... ... @@ -245,6 +249,7 @@ AC_SUBST(DLL_CFLAGS)
245 249 AC_SUBST(DLLDIR)
246 250 AC_SUBST(LDSOFLAGS)
247 251 AC_SUBST(DBGRPATH)
  252 +AC_SUBST(DBGCMDPREFIX)
248 253 AC_SUBST(LDARCH,"-arch $build_cpu")
249 254  
250 255 #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------
... ...
pw3270.xcodeproj/project.pbxproj
  Diff comments   View file @5be5dd0
... ... @@ -7,6 +7,7 @@
7 7 objects = {
8 8  
9 9 /* Begin PBXFileReference section */
  10 + C21BB73815D940960093E2FA /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.in; sourceTree = "<group>"; };
10 11 C272066315D7F88300CCCD22 /* configure.ac */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = configure.ac; sourceTree = "<group>"; };
11 12 C272066715D7FBF700CCCD22 /* action_table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = action_table.h; sourceTree = "<group>"; };
12 13 C272066815D7FBF700CCCD22 /* actions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = actions.h; sourceTree = "<group>"; };
... ... @@ -262,9 +263,10 @@
262 263 C232305B15D7F01F00E76E83 = {
263 264 isa = PBXGroup;
264 265 children = (
  266 + C21BB73815D940960093E2FA /* Makefile.in */,
265 267 C2C4DAD815D8282600E8C6A0 /* autogen.sh */,
266   - C272066415D7FBF700CCCD22 /* src */,
267 268 C272066315D7F88300CCCD22 /* configure.ac */,
  269 + C272066415D7FBF700CCCD22 /* src */,
268 270 );
269 271 sourceTree = "<group>";
270 272 usesTabs = 1;
... ...
pw3270.xcodeproj/project.xcworkspace/xcuserdata/perry.xcuserdatad/UserInterfaceState.xcuserstate
View file @5be5dd0
No preview for this file type
src/pw3270/v3270/widget.c
  Diff comments   View file @5be5dd0
... ... @@ -721,7 +721,7 @@ static void changed(H3270 *session, int offset, int len)
721 721 &bytes_written,
722 722 &error );
723 723  
724   - free(text);
  724 + lib3270_free(text);
725 725  
726 726 if(error)
727 727 {
... ... @@ -784,7 +784,7 @@ static void v3270_init(v3270 *widget)
784 784 {
785 785 widget->host = lib3270_session_new("");
786 786  
787   - trace("%s host->sz=%d expected=%d revision=%s expected=%s",__FUNCTION__,widget->host->sz,sizeof(H3270),lib3270_get_revision(),PACKAGE_REVISION);
  787 + trace("%s host->sz=%d expected=%d revision=%s expected=%s",__FUNCTION__,widget->host->sz,(int) sizeof(H3270),lib3270_get_revision(),PACKAGE_REVISION);
788 788  
789 789 if(widget->host->sz != sizeof(H3270))
790 790 {
... ...