fixes for build on ubuntu / gitlabci

This commit is contained in:
Dagen Brock 2016-02-06 09:30:48 -06:00
parent afc826b543
commit aa5411d0ca
2 changed files with 6 additions and 3 deletions

View File

@ -1,5 +1,5 @@
before_script:
- apt-get update -qq && apt-get install -y -qq g++ libpcap0.8-dev libx11-dev libxext-dev
- sudo apt-get update -qq && apt-get install -y -qq g++ libpcap0.8-dev libx11-dev libxext-dev
build:
script:

View File

@ -1,14 +1,17 @@
TARGET = gsportx
OBJECTS = $(OBJECTS1) $(TFEOBJ) $(ATOBJ) $(PCAPOBJ) xdriver.o
CC = gcc
CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -march=i686 -DHAVE_TFE -DHAVE_ATBRIDGE -DTOGGLE_STATUS
#-march=i686 is causing "error: CPU you selected does not support x86-64 instruction set" on ubuntu
#CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -march=i686 -DHAVE_TFE -DHAVE_ATBRIDGE -DTOGGLE_STATUS
CCOPTS = -O2 -Wall -fomit-frame-pointer -std=gnu99 -DHAVE_TFE -DHAVE_ATBRIDGE -DTOGGLE_STATUS
OPTS = -DGSPORT_LITTLE_ENDIAN
SUFFIX =
NAME = gsportx
LDFLAGS =
LDOPTS =
LD = g++
EXTRA_LIBS = -lXext
# added -ldl for ubuntu
EXTRA_LIBS = -lXext -ldl
EXTRA_SPECIALS =
AS = cc