Skip to content

Commit

Permalink
fixed MacOS build issues
Browse files Browse the repository at this point in the history
  • Loading branch information
datajerk committed Mar 27, 2017
1 parent 7d928fc commit c8b823f
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 22 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
41 changes: 23 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -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 <egan@sense.net>

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

Expand All @@ -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

------------------------------------------------------------------------

Expand Down Expand Up @@ -120,15 +114,15 @@ Restore backup:

BACKUP
3
->TAG
-\>TAG
RESTORE

Install ARMToolbox (HPGCC2):

2
SETUP.BIN
3
->TAG
-\>TAG
RCL
EVAL
(Right Click ON, Left Click C)
Expand Down Expand Up @@ -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

4 changes: 2 additions & 2 deletions newconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ then
fi

B=${PWD##$HOME/}
perl -pi -e "s!^(basename=).*!\1$B!" <config.tmpl >config
perl -p -e "s!^(basename=).*!\1$B!" <config.tmpl >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"
Expand Down

0 comments on commit c8b823f

Please sign in to comment.