From 8e9c568db5aa6a6a47107a74e0ec00477b32820c Mon Sep 17 00:00:00 2001
From: Dagen Brock <dagenbrock@gmail.com>
Date: Thu, 3 Mar 2016 15:25:24 -0600
Subject: [PATCH] sdl2 ubuntu build

---
 .gitlab-ci.yml         | 11 +++++++++++
 src/vars_x86linux_sdl  | 11 ++++++-----
 src/vars_x86linux_sdl2 | 21 +++++++++++++++++++++
 3 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 src/vars_x86linux_sdl2

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2670877..f47b704 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,6 +22,17 @@ build-ubuntu-sdl:
     - ln -s vars_x86linux_sdl vars
     - make clean ; make
 
+build-ubuntu-sdl2:
+  tags:
+    - ubuntu
+  stage: build
+  script:
+    - sudo apt-get update -qq && apt-get install -y -qq g++ libpcap0.8-dev libx11-dev libsdl2-dev libfreetype6-dev
+    - cd src
+    - ln -s vars_x86linux_sdl2 vars
+    - make clean ; make
+
+
 
 build-osx:
   tags:
diff --git a/src/vars_x86linux_sdl b/src/vars_x86linux_sdl
index 9adad7e..3da6b6b 100644
--- a/src/vars_x86linux_sdl
+++ b/src/vars_x86linux_sdl
@@ -1,18 +1,19 @@
 TARGET = gsportx
-OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) xdriver.o sdlsnd_driver2.o
+NAME = gsportx
+PERL = perl
 CC = gcc
+LD = g++
+AS = cc
+
+OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) xdriver.o sdlsnd_driver2.o
 CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -DHAVE_SDL -DHAVE_TFE -DHAVE_ATBRIDGE -DTOGGLE_STATUS -I/usr/include/SDL2 -I/usr/include/freetype2
 CPPOPTS = -O2 -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -DHAVE_ATBRIDGE -I/usr/include/freetype2 -I/usr/include/SDL2
 OPTS = -DGSPORT_LITTLE_ENDIAN 
 SUFFIX =
-NAME = gsportx
 LDFLAGS =
 LDOPTS =
-LD = g++
 EXTRA_LIBS = -lXext -lfreetype -lSDL2 -ldl
 EXTRA_SPECIALS =
 
-AS = cc
-PERL = perl
 
 XOPTS = -I/usr/X11R6/include
diff --git a/src/vars_x86linux_sdl2 b/src/vars_x86linux_sdl2
new file mode 100644
index 0000000..9436f05
--- /dev/null
+++ b/src/vars_x86linux_sdl2
@@ -0,0 +1,21 @@
+TARGET = gsplus
+NAME = gsplus
+PERL = perl
+CC = gcc
+LD = gcc
+AS = cc
+
+OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) osxdriver.o sdlsnd_driver2.o
+
+# C Compiler Options
+CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -DHAVE_SDL -DHAVE_TFE -DHAVE_ATBRIDGE -DTOGGLE_STATUS -I/usr/include/SDL2 -I/usr/include/freetype2
+# C++ Compiler Options
+CPPOPTS = -O2 -DHAVE_TFE -DHAVE_SDL -DTOGGLE_STATUS -DHAVE_ATBRIDGE -I/usr/include/freetype2 -I/usr/include/SDL2
+
+
+EXTRA_LIBS = -lfreetype -lSDL2 -ldl -lm -lstdc++
+OPTS = -DGSPORT_LITTLE_ENDIAN
+SUFFIX =
+LDFLAGS =
+LDOPTS = -I.
+EXTRA_SPECIALS =