From b3ad34bdffeca406765e699465fa1150a0401939 Mon Sep 17 00:00:00 2001
From: Dagen Brock <dagenbrock@gmail.com>
Date: Sun, 7 Feb 2016 12:48:07 -0600
Subject: [PATCH] linux sdl build

---
 .gitlab-ci.yml        | 12 +++++++++++-
 src/vars_x86linux_sdl |  8 ++++----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 85a8004..2670877 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,7 @@
 stages:
   - build
 
-build-ubuntu:
+build-ubuntu-x:
   tags:
     - ubuntu
   stage: build
@@ -12,6 +12,16 @@ build-ubuntu:
     - ln -s vars_x86linux_x11 vars
     - make clean ; make
 
+build-ubuntu-sdl:
+  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_sdl vars
+    - make clean ; make
+
 
 build-osx:
   tags:
diff --git a/src/vars_x86linux_sdl b/src/vars_x86linux_sdl
index b9ffa5b..cb94a84 100644
--- a/src/vars_x86linux_sdl
+++ b/src/vars_x86linux_sdl
@@ -1,15 +1,15 @@
 TARGET = gsportx
-OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) xdriver.o
+OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) xdriver.o sdlsnd_driver2.o
 CC = gcc
-CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -march=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/SDL
+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 -lSDL
+EXTRA_LIBS = -lXext -lfreetype -lSDL2 -ldl
 EXTRA_SPECIALS =
 
 AS = cc