From e00c3a92bd47c9fe2ca996d9da73bbc2e1ce5808 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Fri, 9 Jun 2017 06:39:04 +0000 Subject: [PATCH] Makefile: Move the ENet group up into a new section for libraries that are not ours but included in our repository. git-svn-id: https://svn.eduke32.com/eduke32@6154 1a8010ca-5511-0410-912e-c29ae57300e0 --- GNUmakefile | 57 +++++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 8df1a3b9b..0ff7b7d28 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -30,6 +30,35 @@ endef COMPILERFLAGS += -I$(ENGINE_INC) -I$(MACT_INC) -I$(AUDIOLIB_INC) -I$(ENET_INC) +##### External Library Definitions + +#### ENet + +ENET=enet + +ENET_OBJS = \ + callbacks.c \ + host.c \ + list.c \ + packet.c \ + peer.c \ + protocol.c \ + compress.c \ + +ENET_ROOT=$(source)/$(ENET) +ENET_SRC=$(ENET_ROOT)/src +ENET_INC=$(ENET_ROOT)/include +ENET_OBJ=$(obj)/$(ENET) + +ENET_CFLAGS= + +ifeq ($(PLATFORM),WINDOWS) + ENET_OBJS += win32.c +else + ENET_OBJS += unix.c + ENET_CFLAGS += -DHAS_SOCKLEN_T +endif + ##### Component Definitions @@ -212,34 +241,6 @@ ifeq ($(MIXERTYPE),SDL) endif -#### ENet - -ENET=enet - -ENET_OBJS = \ - callbacks.c \ - host.c \ - list.c \ - packet.c \ - peer.c \ - protocol.c \ - compress.c \ - -ENET_ROOT=$(source)/$(ENET) -ENET_SRC=$(ENET_ROOT)/src -ENET_INC=$(ENET_ROOT)/include -ENET_OBJ=$(obj)/$(ENET) - -ENET_CFLAGS= - -ifeq ($(PLATFORM),WINDOWS) - ENET_OBJS += win32.c -else - ENET_OBJS += unix.c - ENET_CFLAGS += -DHAS_SOCKLEN_T -endif - - #### Tools TOOLS=tools