From 785dd2208298f7ddac8fe288279171be04ddc6e8 Mon Sep 17 00:00:00 2001 From: Dagen Brock Date: Fri, 5 Jul 2013 13:21:05 -0500 Subject: [PATCH 1/4] first commit --- README | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 README diff --git a/README b/README new file mode 100644 index 0000000..e69de29 From 253129eb5f189e633ef9b9fcdc391e151dda0742 Mon Sep 17 00:00:00 2001 From: Dagen Brock Date: Thu, 4 Feb 2016 00:43:57 -0600 Subject: [PATCH 2/4] latest vars --- src/vars_osx | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/src/vars_osx b/src/vars_osx index 1166564..c8de112 100644 --- a/src/vars_osx +++ b/src/vars_osx @@ -1,25 +1,31 @@ TARGET = gsplus +NAME = gsplus +PERL = perl CC = clang -LD = g++ -OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) osxdriver.o sdlsnd_driver2.o -#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 +LD = clang++ +AS = cc -## LOOK OUT FOR OPTIMIZATION FLAGS. I'VE BEEN DISABLING -O2 to debug (-O0 for debug) -#CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/SDL2 -I/usr/local/include/freetype2 -g -#CPPOPTS = -O2 -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/freetype2 -I/usr/local/include/SDL2 -#EXTRA_LIBS = -lfreetype -lSDL2 -CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/SDL2 -I/usr/local/include/freetype2 -CPPOPTS = -O2 -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -I/usr/local/include/freetype2 -I/usr/local/include/SDL2 +OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) osxdriver.o sdlsnd_driver2.o +ARCHS = ppc, i386, ppc64, x86_64 + +# OPTIONS FOR COMPILING C SOURCE +CCOPTS = $(MACSUX) -O2 -Wall -fomit-frame-pointer -std=gnu99 -DHAVE_SDL -DTOGGLE_STATUS -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 OPTS = -DGSPORT_LITTLE_ENDIAN SUFFIX = -NAME = gsplus LDFLAGS = LDOPTS = -I. EXTRA_SPECIALS = - -AS = cc -PERL = perl - -#XOPTS = -I/usr/X11/include From 360b890e29596f6dfa36326662b1204b91faaf6b Mon Sep 17 00:00:00 2001 From: Dagen Brock Date: Sat, 6 Feb 2016 07:32:57 -0600 Subject: [PATCH 3/4] clean and divide build docs --- README.txt | 15 +++------------ doc/Developer-QuickStart-Linux.txt | 21 +++++++++++++++++++++ doc/Developer-QuickStart-MacOSX.txt | 27 +++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 12 deletions(-) create mode 100644 doc/Developer-QuickStart-Linux.txt create mode 100644 doc/Developer-QuickStart-MacOSX.txt diff --git a/README.txt b/README.txt index ab56587..436965d 100644 --- a/README.txt +++ b/README.txt @@ -49,16 +49,7 @@ Dagen Brock Saturday, January 30, 2016 1:18PM -------------------------------------------------------------------------------- -Mac OSX Build Instructions +Build Instructions ========================== -Download the repo -Install 'brew' if you don't already have it installed. (Google it, it's easy.) -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 +See the /doc/ directory for "Developer-Quickstart" docs which cover building +for the various platforms. (as fast as I can write them :P ) diff --git a/doc/Developer-QuickStart-Linux.txt b/doc/Developer-QuickStart-Linux.txt new file mode 100644 index 0000000..0695714 --- /dev/null +++ b/doc/Developer-QuickStart-Linux.txt @@ -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 + + + + + diff --git a/doc/Developer-QuickStart-MacOSX.txt b/doc/Developer-QuickStart-MacOSX.txt new file mode 100644 index 0000000..0bc6951 --- /dev/null +++ b/doc/Developer-QuickStart-MacOSX.txt @@ -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 + + From 02a9c5ae641273c442dc647d2678e01b9d33bb9b Mon Sep 17 00:00:00 2001 From: Dagen Brock Date: Sat, 6 Feb 2016 09:01:47 -0600 Subject: [PATCH 4/4] clean empty file --- README | 0 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 README diff --git a/README b/README deleted file mode 100644 index e69de29..0000000