diff --git a/Makefile b/Makefile index 486d2e2..60da599 100644 --- a/Makefile +++ b/Makefile @@ -169,10 +169,10 @@ endif ifdef QEMU_OLD $(TARGET): $(OBJS) $(VVFATOBJS) $(QEMU)/arm-softmmu/libqemu.a - $(CC) -Wl,--no-as-needed $(LDFLAGS) -o $@ $(OBJS) $(VVFATOBJS) $(LDLIBS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(VVFATOBJS) $(LDLIBS) else $(TARGET): $(OBJS) $(VVFATOBJS) $(X49GP_LIBS) - $(CC) -Wl,--no-as-needed $(LDFLAGS) -o $@ $(OBJS) $(VVFATOBJS) $(LDLIBS) + $(CC) $(LDFLAGS) -o $@ $(OBJS) $(VVFATOBJS) $(LDLIBS) endif flash-49g+: $(BOOT49GP) flash-noboot diff --git a/README.md b/README.md index b9899f3..246b0a4 100644 --- a/README.md +++ b/README.md @@ -1,33 +1,27 @@ -Additional note: August 22, 2013 - -Updated this so that it'll compile on Ubuntu 12.04. - ---Nicholas Kirchner - Quick Start Guide -04/25/2010 +03/27/2017 Egan Ford NOTE: READ ALL INSTRUCTIONS Prereqs: -* OS/X 10.6 64-bit: +* MacOS 10.12 64-bit: - * Install X11, Xcode (from your installation media) in that order. + * Install XQuartz, Xcode (from your installation media) in that order. * Install Macports (macports.org), then: - sudo port install gtk2 - sudo port install pkgconfig + sudo port install gtk2 pkgconfig gcc6 + sudo port select --set gcc mp-gcc6 + export PATH=/opt/local/bin:$PATH -* Ubuntu 9.04 32-bit, 9.04 64-bit, 9.10 32-bit, 9.10 64-bit: +* Ubuntu: - sudo apt-get install libgtk2.0-dev - sudo apt-get install subversion + sudo apt-get install libgtk2.0-dev -* RedHat/CentOS 5.4 64-bit, Fedora 12 64-bit: +* RedHat/CentOS: sudo yum install subversion gtk2-devel @@ -39,7 +33,7 @@ Start up X11 and use xterm Download x49gp source: -svn co http://x49gp.svn.sourceforge.net/svnroot/x49gp x49gp +git clone https://github.com/datajerk/x49gp.git ------------------------------------------------------------------------ @@ -120,7 +114,7 @@ Restore backup: BACKUP 3 -->TAG +-\>TAG RESTORE Install ARMToolbox (HPGCC2): @@ -128,7 +122,7 @@ Install ARMToolbox (HPGCC2): 2 SETUP.BIN 3 -->TAG +-\>TAG RCL EVAL (Right Click ON, Left Click C) @@ -161,3 +155,14 @@ Known Limitations: . libfsystem unavailable. . f* calls unstable (HPGCC2) . f* calls stable (HPGCC3) + +------------------------------------------------------------------------ + +Change Log: + +Additional note: August 22, 2013 + +Updated this so that it'll compile on Ubuntu 12.04. + +--Nicholas Kirchner + diff --git a/newconfig b/newconfig index 7050357..50a0e01 100755 --- a/newconfig +++ b/newconfig @@ -7,11 +7,11 @@ then fi B=${PWD##$HOME/} -perl -pi -e "s!^(basename=).*!\1$B!" config +perl -p -e "s!^(basename=).*!\1$B!" config if [ "$(uname -s)" = "Linux" ] then - perl -pi -e "s!^(filename=sdcard).dmg!\1!" config + perl -p -e "s!^(filename=sdcard).dmg!\1!" config fi echo "New config created"