Download as
Browse Code »

Commit e74e2aad8ce63216953abdbdb639d155f5693eb6

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

Ajustes para MACOSX

Showing 6 changed files with 7 additions and 3 deletions   Show diff stats
1 -#!/bin/bash 1 +#!/bin/bash -x
2 2
3 APPLEVEL="0" 3 APPLEVEL="0"
4 4
@@ -129,6 +129,7 @@ case "$host" in @@ -129,6 +129,7 @@ case "$host" in
129 LDSOFLAGS="" 129 LDSOFLAGS=""
130 DLLDIR="/lib" 130 DLLDIR="/lib"
131 DBGRPATH="" 131 DBGRPATH=""
  132 + LDSOFLAGS="-Wl,-install_name,\`basename \$@\`"
132 ;; 133 ;;
133 134
134 *) 135 *)
@@ -244,6 +245,7 @@ AC_SUBST(DLL_CFLAGS) @@ -244,6 +245,7 @@ AC_SUBST(DLL_CFLAGS)
244 AC_SUBST(DLLDIR) 245 AC_SUBST(DLLDIR)
245 AC_SUBST(LDSOFLAGS) 246 AC_SUBST(LDSOFLAGS)
246 AC_SUBST(DBGRPATH) 247 AC_SUBST(DBGRPATH)
  248 +AC_SUBST(LDARCH,"-arch $build_cpu")
247 249
248 #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------ 250 #--[ Headers ]------------------------------------------------------------------------------------------------------------------------------------------------
249 251
pw3270.xcodeproj/project.pbxproj
  Diff comments   View file @e74e2aa
@@ -255,12 +255,14 @@ @@ -255,12 +255,14 @@
255 C272076B15D7FBF700CCCD22 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; }; 255 C272076B15D7FBF700CCCD22 /* Makefile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.make; path = Makefile; sourceTree = "<group>"; };
256 C272076C15D7FBF700CCCD22 /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.in; sourceTree = "<group>"; }; 256 C272076C15D7FBF700CCCD22 /* Makefile.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Makefile.in; sourceTree = "<group>"; };
257 C272076D15D7FBF700CCCD22 /* xml2pot.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xml2pot.c; sourceTree = "<group>"; }; 257 C272076D15D7FBF700CCCD22 /* xml2pot.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = xml2pot.c; sourceTree = "<group>"; };
  258 + C2C4DAD815D8282600E8C6A0 /* autogen.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = autogen.sh; sourceTree = "<group>"; };
258 /* End PBXFileReference section */ 259 /* End PBXFileReference section */
259 260
260 /* Begin PBXGroup section */ 261 /* Begin PBXGroup section */
261 C232305B15D7F01F00E76E83 = { 262 C232305B15D7F01F00E76E83 = {
262 isa = PBXGroup; 263 isa = PBXGroup;
263 children = ( 264 children = (
  265 + C2C4DAD815D8282600E8C6A0 /* autogen.sh */,
264 C272066415D7FBF700CCCD22 /* src */, 266 C272066415D7FBF700CCCD22 /* src */,
265 C272066315D7F88300CCCD22 /* configure.ac */, 267 C272066315D7F88300CCCD22 /* configure.ac */,
266 ); 268 );
pw3270.xcodeproj/project.xcworkspace/xcuserdata/perry.xcuserdatad/UserInterfaceState.xcuserstate
View file @e74e2aa
No preview for this file type
pw3270.xcodeproj/xcuserdata/perry.xcuserdatad/xcschemes/pw3270.xcscheme
  Diff comments   View file @e74e2aa
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <BuildableReference 15 <BuildableReference
16 BuildableIdentifier = "primary" 16 BuildableIdentifier = "primary"
17 BlueprintIdentifier = "C232306215D7F01F00E76E83" 17 BlueprintIdentifier = "C232306215D7F01F00E76E83"
18 - BuildableName = "pw3270" 18 + BuildableName = "Debug"
19 BlueprintName = "Debug" 19 BlueprintName = "Debug"
20 ReferencedContainer = "container:pw3270.xcodeproj"> 20 ReferencedContainer = "container:pw3270.xcodeproj">
21 </BuildableReference> 21 </BuildableReference>
src/pw3270/Makefile.in
  Diff comments   View file @e74e2aa
@@ -130,7 +130,7 @@ $(BINDBG)/$(PACKAGE_TARNAME)$(EXEEXT): $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@D @@ -130,7 +130,7 @@ $(BINDBG)/$(PACKAGE_TARNAME)$(EXEEXT): $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@D
130 $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT)) 130 $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT))
131 @echo " CCLD `basename $@`" 131 @echo " CCLD `basename $@`"
132 @$(MKDIR) `dirname $@` 132 @$(MKDIR) `dirname $@`
133 - $(LD) @DBGRPATH@ -o $@ $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT)) $(LIBS) $(LIB3270_LIBS) -l$(PACKAGE_TARNAME) 133 + $(LD) @LDARCH@ @DBGRPATH@ -o $@ $(foreach SRC, $(basename $(APP_SOURCES)), $(OBJDBG)/$(SRC)$(OBJEXT)) $(LIBS) $(LIB3270_LIBS) -l$(PACKAGE_TARNAME)
134 134
135 $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@ 135 $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@: $(LIBDBG)/@DLLPREFIX@$(PACKAGE_TARNAME)@DLLEXT@.@VERSION@
136 @rm -f $@ 136 @rm -f $@