fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-11 10:11:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix linkage for solaris: needs -lsocket -lnsl -lresolv for network

Browse source 
git-svn-id: http://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@678 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
sezero 2012-05-30 09:28:34 +00:00
parent 08d5e1ac69
commit 436f0f980f
4 changed files with 19 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
Quake/Makefile
View file

@ -27,31 +27,10 @@ check_gcc = $(shell if echo | $(CC) $(1) -S -o /dev/null -xc - > /dev/null 2>&1;
# ============================================================================ # ============================================================================
DEBUG ?= 0 HOST_OS := $(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]')
SDLNET ?= 0
BUILDDIR := . DEBUG ?= 0
SDLNET ?= 0
SYSNAME := $(shell uname -s)
ifneq (,$(findstring MINGW32,$(SYSNAME)))
HOST_OS = WIN32
TOPDIR := $(shell pwd -W)
else
ifneq (,$(findstring $(SYSNAME),FreeBSD NetBSD OpenBSD))
HOST_OS = UNIX
UNIX = bsd
TOPDIR := $(shell pwd)
else
ifneq (,$(findstring Linux,$(SYSNAME)))
HOST_OS = UNIX
UNIX = linux
TOPDIR := $(shell pwd)
else
$(error OS type not detected.)
endif
endif
endif
# --------------------------------------- # ---------------------------------------
# build variables # build variables
@ -114,8 +93,12 @@ ifeq ($(SDLNET),1)
NET_LIBS :=-lSDL_net NET_LIBS :=-lSDL_net
CFLAGS +=-D_USE_SDLNET CFLAGS +=-D_USE_SDLNET
else else
ifeq ($(HOST_OS),sunos)
NET_LIBS :=-lsocket -lnsl -lresolv
else
NET_LIBS := NET_LIBS :=
endif endif
endif
ifeq ($(USE_QS_CONBACK),1) ifeq ($(USE_QS_CONBACK),1)
CFLAGS+= -DUSE_QS_CONBACK CFLAGS+= -DUSE_QS_CONBACK

36
Quake/Makefile.darwin
View file

@ -42,37 +42,13 @@ check_gcc = $(shell if echo | $(CC) $(1) -S -o /dev/null -xc - > /dev/null 2>&1;
# ============================================================================ # ============================================================================
DEBUG ?= 0 HOST_OS := $(shell uname|sed -e s/_.*//|tr '[:upper:]' '[:lower:]')
SDLNET ?= 0 ifneq ($(HOST_OS),darwin))
$(error This Makefile is for Darwin only)
endif
BUILDDIR := . DEBUG ?= 0
SDLNET ?= 0
SYSNAME := $(shell uname -s)
ifneq (,$(findstring MINGW32,$(SYSNAME)))
HOST_OS = WIN32
TOPDIR := $(shell pwd -W)
else
ifneq (,$(findstring $(SYSNAME),FreeBSD NetBSD OpenBSD))
HOST_OS = UNIX
UNIX = bsd
TOPDIR := $(shell pwd)
else
ifneq (,$(findstring Darwin,$(SYSNAME)))
HOST_OS = UNIX
UNIX = darwin
TOPDIR := $(shell pwd)
else
ifneq (,$(findstring Linux,$(SYSNAME)))
HOST_OS = UNIX
UNIX = linux
TOPDIR := $(shell pwd)
else
$(error OS type not detected.)
endif
endif
endif
endif
# --------------------------------------- # ---------------------------------------
# build variables # build variables

8
Quake/Makefile.w32
View file

@ -27,11 +27,9 @@ check_gcc = $(shell if echo | $(CC) $(1) -S -o /dev/null -xc - > /dev/null 2>&1;
# ============================================================================ # ============================================================================
DEBUG ?= 0 DEBUG ?= 0
WINSOCK2 ?= 0 WINSOCK2?= 0
SDLNET ?= 0 SDLNET ?= 0
TOPDIR := $(shell pwd)
# --------------------------------------- # ---------------------------------------
# build variables # build variables

8
Quake/Makefile.w64
View file

@ -27,11 +27,9 @@ check_gcc = $(shell if echo | $(CC) $(1) -S -o /dev/null -xc - > /dev/null 2>&1;
# ============================================================================ # ============================================================================
DEBUG ?= 0 DEBUG ?= 0
WINSOCK2 ?= 1 WINSOCK2?= 1
SDLNET ?= 0 SDLNET ?= 0
TOPDIR := $(shell pwd)
# --------------------------------------- # ---------------------------------------
# build variables # build variables