From e74e2aad8ce63216953abdbdb639d155f5693eb6 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Sun, 12 Aug 2012 18:49:51 +0000 Subject: [PATCH] Ajustes para MACOSX --- autogen.sh | 2 +- configure.ac | 2 ++ pw3270.xcodeproj/project.pbxproj | 2 ++ pw3270.xcodeproj/project.xcworkspace/xcuserdata/perry.xcuserdatad/UserInterfaceState.xcuserstate | Bin 15634 -> 0 bytes pw3270.xcodeproj/xcuserdata/perry.xcuserdatad/xcschemes/pw3270.xcscheme | 2 +- src/pw3270/Makefile.in | 2 +- 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/autogen.sh b/autogen.sh index e851783..617262b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -x APPLEVEL="0" diff --git a/configure.ac b/configure.ac index c624ecd..63d08c3 100644 --- a/configure.ac +++ b/configure.ac @@ -129,6 +129,7 @@ case "$host" in LDSOFLAGS="" DLLDIR="/lib" DBGRPATH="" + LDSOFLAGS="-Wl,-install_name,\`basename \$@\`" ;; *) @@ -244,6 +245,7 @@ AC_SUBST(DLL_CFLAGS) AC_SUBST(DLLDIR) AC_SUBST(LDSOFLAGS) AC_SUBST(DBGRPATH) +AC_SUBST(LDARCH,"-arch $build_cpu") #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------ diff --git a/pw3270.xcodeproj/project.pbxproj b/pw3270.xcodeproj/project.pbxproj index 34af3fd..0b93686 100644 --- a/pw3270.xcodeproj/project.pbxproj +++ b/pw3270.xcodeproj/project.pbxproj @@ -255,12 +255,14 @@ C272076B15D7FBF700CCCD22 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = ""; }; C272076C15D7FBF700CCCD22 /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.in; sourceTree = ""; }; C272076D15D7FBF700CCCD22 /* xml2pot.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xml2pot.c; sourceTree = ""; }; + C2C4DAD815D8282600E8C6A0 /* autogen.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = autogen.sh; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXGroup section */ C232305B15D7F01F00E76E83 = { isa = PBXGroup; children = ( + C2C4DAD815D8282600E8C6A0 /* autogen.sh */, C272066415D7FBF700CCCD22 /* src */, C272066315D7F88300CCCD22 /* configure.ac */, ); diff --git a/pw3270.xcodeproj/project.xcworkspace/xcuserdata/perry.xcuserdatad/UserInterfaceState.xcuserstate b/pw3270.xcodeproj/project.xcworkspace/xcuserdata/perry.xcuserdatad/UserInterfaceState.xcuserstate index 8f7fcef..f402198 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/pw3270.xcodeproj/xcuserdata/perry.xcuserdatad/xcschemes/pw3270.xcscheme b/pw3270.xcodeproj/xcuserdata/perry.xcuserdatad/xcschemes/pw3270.xcscheme index d557748..acafb0e 100644 --- a/pw3270.xcodeproj/xcuserdata/perry.xcuserdatad/xcschemes/pw3270.xcscheme +++ b/pw3270.xcodeproj/xcuserdata/perry.xcuserdatad/xcschemes/pw3270.xcscheme @@ -15,7 +15,7 @@ diff --git a/src/pw3270/Makefile.in b/src/pw3270/Makefile.in index 72f490d..3cc607b 100644 --- a/src/pw3270/Makefile.in +++ b/src/pw3270/Makefile.in @@ -130,7 +130,7 @@ $(BINDBG)/$(PACKAGE_TARNAME)$(EXEEXT): $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@D $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT)) @echo " CCLD `basename $@`" @$(MKDIR) `dirname $@` - $(LD) @DBGRPATH@ -o $@ $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT)) $(LIBS) $(LIB3270_LIBS) -l$(PACKAGE_TARNAME) + $(LD) @LDARCH@ @DBGRPATH@ -o $@ $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT)) $(LIBS) $(LIB3270_LIBS) -l$(PACKAGE_TARNAME) $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ @rm -f $@ -- libgit2 0.21.2