From 5be5dd07beac0039e3aa50e8aeb7a84490199af3 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Mon, 13 Aug 2012 14:14:14 +0000 Subject: [PATCH] Ajustes para executar em macosx --- Makefile.in | 3 ++- configure.ac | 7 ++++++- pw3270.xcodeproj/project.pbxproj | 4 +++- pw3270.xcodeproj/project.xcworkspace/xcuserdata/perry.xcuserdatad/UserInterfaceState.xcuserstate | Bin 16623 -> 0 bytes src/pw3270/v3270/widget.c | 4 ++-- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in index e5ed929..b8b6f59 100644 --- a/Makefile.in +++ b/Makefile.in @@ -71,6 +71,7 @@ MSGFMT=@MSGFMT@ XML2POT=src/tools/xml2pot@EXEEXT@ SHELL=@SHELL@ AMTAR=@AMTAR@ +DBGCMDPREFIX=@DBGCMDPREFIX@ #---[ Rules ]------------------------------------------------------------------ @@ -157,7 +158,7 @@ $(BINDIR)/Debug@DLLDIR@/@DLLPREFIX@3270@DLLEXT@: src/lib3270/* src/include/lib32 @$(MAKE) BINDBG=../../.bin/Debug@DLLDIR@ -C src/lib3270 ../../.bin/Debug@DLLDIR@/@DLLPREFIX@3270@DLLEXT@ run: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) $(PACKAGE_NAME).png $(PACKAGE_NAME)-logo.png - @PATH="$(BINDIR)/Debug@DLLDIR@:$(PATH)" "$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)" + @$(DBGCMDPREFIX) "$(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT)" memchk: $(BINDIR)/Debug/$(PACKAGE_TARNAME)$(EXEEXT) ifeq ($(VALGRIND),no) diff --git a/configure.ac b/configure.ac index 63d08c3..a776d99 100644 --- a/configure.ac +++ b/configure.ac @@ -104,7 +104,6 @@ DLLEXT=".so" OBJEXT=".o" EXEEXT="" DLLPREFIX="lib" -DLLDIR="/lib" if test $host != $build; then AC_CHECK_PROGS(HOST_CC, gcc cc) @@ -122,6 +121,7 @@ case "$host" in LDSOFLAGS="-Wl,-soname,\`basename \$@\`" DBGRPATH="" DLLDIR="" + DBGCMDPREFIX="PATH=\$(BINDIR)/Debug/lib:\$(PATH)" AC_PATH_TOOL([STRIP], [strip]) ;; @@ -129,13 +129,17 @@ case "$host" in LDSOFLAGS="" DLLDIR="/lib" DBGRPATH="" + DBGCMDPREFIX="DYLD_LIBRARY_PATH=\$(BINDIR)/Debug/lib" LDSOFLAGS="-Wl,-install_name,\`basename \$@\`" ;; *) LDSOFLAGS="-Wl,-soname,\`basename \$@\`" + DLLDIR="/lib" DBGRPATH="-Wl,--rpath,.bin/Debug/lib" + DBGCMDPREFIX="PATH=\$(BINDIR)/Debug/lib:\$(PATH)" AC_PATH_TOOL([STRIP], [strip]) + esac @@ -245,6 +249,7 @@ AC_SUBST(DLL_CFLAGS) AC_SUBST(DLLDIR) AC_SUBST(LDSOFLAGS) AC_SUBST(DBGRPATH) +AC_SUBST(DBGCMDPREFIX) AC_SUBST(LDARCH,"-arch $build_cpu") #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------ diff --git a/pw3270.xcodeproj/project.pbxproj b/pw3270.xcodeproj/project.pbxproj index 0b93686..a59bbf6 100644 --- a/pw3270.xcodeproj/project.pbxproj +++ b/pw3270.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXFileReference section */ + C21BB73815D940960093E2FA /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.in; sourceTree = ""; }; C272066315D7F88300CCCD22 /* configure.ac */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = configure.ac; sourceTree = ""; }; C272066715D7FBF700CCCD22 /* action_table.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = action_table.h; sourceTree = ""; }; C272066815D7FBF700CCCD22 /* actions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = actions.h; sourceTree = ""; }; @@ -262,9 +263,10 @@ C232305B15D7F01F00E76E83 = { isa = PBXGroup; children = ( + C21BB73815D940960093E2FA /* Makefile.in */, C2C4DAD815D8282600E8C6A0 /* autogen.sh */, - C272066415D7FBF700CCCD22 /* src */, C272066315D7F88300CCCD22 /* configure.ac */, + C272066415D7FBF700CCCD22 /* src */, ); sourceTree = ""; usesTabs = 1; diff --git a/pw3270.xcodeproj/project.xcworkspace/xcuserdata/perry.xcuserdatad/UserInterfaceState.xcuserstate b/pw3270.xcodeproj/project.xcworkspace/xcuserdata/perry.xcuserdatad/UserInterfaceState.xcuserstate index f402198..9b2776d 100644 Binary files a/pw3270.xcodeproj/project.xcworkspace/xcuserdata/perry.xcuserdatad/UserInterfaceState.xcuserstate and b/pw3270.xcodeproj/project.xcworkspace/xcuserdata/perry.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/src/pw3270/v3270/widget.c b/src/pw3270/v3270/widget.c index dcd42b9..e1c300f 100644 --- a/src/pw3270/v3270/widget.c +++ b/src/pw3270/v3270/widget.c @@ -721,7 +721,7 @@ static void changed(H3270 *session, int offset, int len) &bytes_written, &error ); - free(text); + lib3270_free(text); if(error) { @@ -784,7 +784,7 @@ static void v3270_init(v3270 *widget) { widget->host = lib3270_session_new(""); - trace("%s host->sz=%d expected=%d revision=%s expected=%s",__FUNCTION__,widget->host->sz,sizeof(H3270),lib3270_get_revision(),PACKAGE_REVISION); + trace("%s host->sz=%d expected=%d revision=%s expected=%s",__FUNCTION__,widget->host->sz,(int) sizeof(H3270),lib3270_get_revision(),PACKAGE_REVISION); if(widget->host->sz != sizeof(H3270)) { -- libgit2 0.21.2