fixed MacOS build issues

This commit is contained in:
Egan Ford 2017-03-27 17:02:05 -06:00
parent 7d928fca72
commit c8b823fb25
3 changed files with 27 additions and 22 deletions

View file

@ -169,10 +169,10 @@ endif
ifdef QEMU_OLD ifdef QEMU_OLD
$(TARGET): $(OBJS) $(VVFATOBJS) $(QEMU)/arm-softmmu/libqemu.a $(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 else
$(TARGET): $(OBJS) $(VVFATOBJS) $(X49GP_LIBS) $(TARGET): $(OBJS) $(VVFATOBJS) $(X49GP_LIBS)
$(CC) -Wl,--no-as-needed $(LDFLAGS) -o $@ $(OBJS) $(VVFATOBJS) $(LDLIBS) $(CC) $(LDFLAGS) -o $@ $(OBJS) $(VVFATOBJS) $(LDLIBS)
endif endif
flash-49g+: $(BOOT49GP) flash-noboot flash-49g+: $(BOOT49GP) flash-noboot

View file

@ -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 Quick Start Guide
04/25/2010 03/27/2017
Egan Ford <egan@sense.net> Egan Ford <egan@sense.net>
NOTE: READ ALL INSTRUCTIONS NOTE: READ ALL INSTRUCTIONS
Prereqs: 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: * Install Macports (macports.org), then:
sudo port install gtk2 sudo port install gtk2 pkgconfig gcc6
sudo port install pkgconfig 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 libgtk2.0-dev
sudo apt-get install subversion
* RedHat/CentOS 5.4 64-bit, Fedora 12 64-bit: * RedHat/CentOS:
sudo yum install subversion gtk2-devel sudo yum install subversion gtk2-devel
@ -39,7 +33,7 @@ Start up X11 and use xterm
Download x49gp source: 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 BACKUP
3 3
->TAG -\>TAG
RESTORE RESTORE
Install ARMToolbox (HPGCC2): Install ARMToolbox (HPGCC2):
@ -128,7 +122,7 @@ Install ARMToolbox (HPGCC2):
2 2
SETUP.BIN SETUP.BIN
3 3
->TAG -\>TAG
RCL RCL
EVAL EVAL
(Right Click ON, Left Click C) (Right Click ON, Left Click C)
@ -161,3 +155,14 @@ Known Limitations:
. libfsystem unavailable. . libfsystem unavailable.
. f* calls unstable (HPGCC2) . f* calls unstable (HPGCC2)
. f* calls stable (HPGCC3) . f* calls stable (HPGCC3)
------------------------------------------------------------------------
Change Log:
Additional note: August 22, 2013
Updated this so that it'll compile on Ubuntu 12.04.
--Nicholas Kirchner

View file

@ -7,11 +7,11 @@ then
fi fi
B=${PWD##$HOME/} 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" ] if [ "$(uname -s)" = "Linux" ]
then then
perl -pi -e "s!^(filename=sdcard).dmg!\1!" config perl -p -e "s!^(filename=sdcard).dmg!\1!" config
fi fi
echo "New config created" echo "New config created"