Merge branch 'master' of github.com:digarok/gsplus

This commit is contained in:
Dagen Brock 2016-02-06 09:19:48 -06:00
commit afc826b543
4 changed files with 73 additions and 28 deletions

View File

@ -49,16 +49,7 @@ Dagen Brock
Saturday, January 30, 2016 1:18PM Saturday, January 30, 2016 1:18PM
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Mac OSX Build Instructions Build Instructions
========================== ==========================
Download the repo See the /doc/ directory for "Developer-Quickstart" docs which cover building
Install 'brew' if you don't already have it installed. (Google it, it's easy.) for the various platforms. (as fast as I can write them :P )
Install SDL libraries if needed:
brew install sdl2
Install FreeType if needed:
brew install freetype
Create a symbolic link from the vars_osx file to 'vars':
cd src
ln -s vars_osx vars
Build the binary:
make clean ; make

View File

@ -0,0 +1,21 @@
# ubuntu - X11 version
# system prep
sudo apt-get -y update
sudo apt-get -y upgrade
sudo apt-get -y install git
sudo apt-get -y install g++
sudo apt-get -y install libpcap0.8-dev
sudo apt-get -y install libx11-dev
sudo apt-get -y install libxext-dev
# build
git clone git@github.com:digarok/gsplus.git
cd gsplus/src
ln -s vars_x86linux_x11 vars
make clean ; make

View File

@ -0,0 +1,27 @@
# Mac OSX - SDL2 version
# Install 'brew' if you don't already have it installed.
# system prep
brew install sdl2
brew install freetype
# build
git clone git@github.com:digarok/gsplus.git
cd gsplus/src
ln -s vars_osx_sdl2 vars
make clean ; make
#Note that installing freetype via brew will install the library, but I think
# maybe you have to install the source and build it to link it in properly.
# You could use /usr/local/src instead of /tmp
cd /tmp
curl --remote-name --location http://sourceforge.net/projects/freetype/files/freetype2/2.6.2/freetype-2.6.2.tar.gz
tar -xzvf freetype-2.6.2.tar.gz
cd freetype-2.6.2
./configure --prefix=/usr/local/freetype-2.6.2
make
make install
ln -s freetype-2.6.2 /usr/local/freetype

View File

@ -1,25 +1,31 @@
TARGET = gsplus TARGET = gsplus
NAME = gsplus
PERL = perl
CC = clang CC = clang
LD = g++ LD = clang++
OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) osxdriver.o sdlsnd_driver2.o AS = cc
#CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -arch=i686 -DHAVE_SDL -DHAVE_TFE -DHAVE_ATBRIDGE -DTOGGLE_STATUS -I/usr/include/SDL -I/usr/include/freetype2
#CPPOPTS = -O2 -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -DHAVE_ATBRIDGE -I/usr/include/freetype2 -I/usr/include/SDL2
## LOOK OUT FOR OPTIMIZATION FLAGS. I'VE BEEN DISABLING -O2 to debug (-O0 for debug) OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) osxdriver.o sdlsnd_driver2.o
#CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/SDL2 -I/usr/local/include/freetype2 -g ARCHS = ppc, i386, ppc64, x86_64
#CPPOPTS = -O2 -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/freetype2 -I/usr/local/include/SDL2
#EXTRA_LIBS = -lfreetype -lSDL2 # OPTIONS FOR COMPILING C SOURCE
CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/SDL2 -I/usr/local/include/freetype2 CCOPTS = $(MACSUX) -O2 -Wall -fomit-frame-pointer -std=gnu99 -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/SDL2
CPPOPTS = -O2 -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/freetype2 -I/usr/local/include/SDL2 # OPTIONS FOR COMPILING C++ SOURCE
CPPOPTS = -O2 -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/freetype2 -I/usr/local/include/SDL2 $(MACSUX)
#SDK = -isysroot /Developer/SDKs/MacOSX10.5.sdk -isysroot /Developer/SDKs/MacOSX10.6.sdk -isysroot /Developer/SDKs/MacOSX10.7.sdk -isysroot /Developer/SDKs/MacOSX10.9.sdk -isysroot /Developer/SDKs/MacOSX10.10.sdk -isysroot /Developer/SDKs/MacOSX10.11.sdk
#INCLUDE = -I/Developer/SDKs/MacOSX10.5.sdk/usr/include -I/Developer/SDKs/MacOSX10.6.sdk/usr/include -I/Developer/SDKs/MacOSX10.7.sdk/usr/include -I/Developer/SDKs/MacOSX10.8.sdk/usr/include -I/Developer/SDKs/MacOSX10.9.sdk/usr/include -I/Developer/SDKs/MacOSX10.10.sdk/usr/include -I/Developer/SDKs/MacOSX10.11.sdk/usr/include
#SDK = -isysroot /Developer/SDKs/MacOSX10.11.sdk
#INCLUDE = -I/Developer/SDKs/MacOSX10.11.sdk/usr/include
MACSUX = $(SDK) $(INCLUDE) -mmacosx-version-min=10.11
EXTRA_LIBS = -lSDL2 -lfreetype EXTRA_LIBS = -lSDL2 -lfreetype
OPTS = -DGSPORT_LITTLE_ENDIAN OPTS = -DGSPORT_LITTLE_ENDIAN
SUFFIX = SUFFIX =
NAME = gsplus
LDFLAGS = LDFLAGS =
LDOPTS = -I. LDOPTS = -I.
EXTRA_SPECIALS = EXTRA_SPECIALS =
AS = cc
PERL = perl
#XOPTS = -I/usr/X11/include