a3176459a6
Red Eclipse is a single-player and multi-player first-person ego-shooter, built as a total conversion of Cube Engine 2, which lends itself toward a balanced gameplay, completely at the control of map makers, while maintaining a general theme of agility in a variety of environments. help from and ok ajacoutot@, ok rfreeman@
89 lines
2.5 KiB
Plaintext
89 lines
2.5 KiB
Plaintext
$OpenBSD: patch-core_mk,v 1.1.1.1 2013/04/29 01:50:57 jsg Exp $
|
|
--- core.mk.orig Fri Mar 22 06:45:14 2013
|
|
+++ core.mk Fri Apr 12 16:04:33 2013
|
|
@@ -3,7 +3,7 @@ APPCLIENT=$(APPNAME)
|
|
APPSERVER=$(APPNAME)_server
|
|
|
|
#CXXFLAGS= -ggdb3
|
|
-CXXFLAGS= -O3 -fomit-frame-pointer
|
|
+CXXFLAGS?= -O3 -fomit-frame-pointer
|
|
override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti
|
|
|
|
PLATFORM= $(shell uname -s)
|
|
@@ -23,12 +23,12 @@ TOOLSET_PREFIX=x86_64-w64-mingw32-
|
|
else
|
|
TOOLSET_PREFIX=i686-w64-mingw32-
|
|
endif
|
|
-CXX=g++
|
|
+CXX?=g++
|
|
endif
|
|
CXX_TEMP:=$(CXX)
|
|
override CXX=$(TOOLSET_PREFIX)$(CXX_TEMP)
|
|
|
|
-INCLUDES= -Ishared -Iengine -Igame -Ienet/include $(APPFLAGS)
|
|
+INCLUDES= -Ishared -Iengine -Igame `pkg-config --cflags libenet` $(APPFLAGS)
|
|
|
|
|
|
STRIP=
|
|
@@ -65,8 +65,8 @@ endif
|
|
CLIENT_INCLUDES= $(INCLUDES) -Iinclude
|
|
CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm
|
|
else
|
|
-CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags`
|
|
-CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
|
|
+CLIENT_INCLUDES= $(INCLUDES) `sdl-config --cflags`
|
|
+CLIENT_LIBS= `pkg-config --libs libenet` `sdl-config --libs` -lX11 -lSDL_image -lSDL_mixer -lz -lGL
|
|
endif
|
|
ifeq ($(PLATFORM),Linux)
|
|
CLIENT_LIBS+= -lrt
|
|
@@ -137,7 +137,7 @@ SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -Iinclude
|
|
SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm
|
|
else
|
|
SERVER_INCLUDES= -DSTANDALONE $(INCLUDES)
|
|
-SERVER_LIBS= -Lenet/.libs -lenet -lz
|
|
+SERVER_LIBS= `pkg-config --libs libenet` -lz
|
|
endif
|
|
SERVER_OBJS= \
|
|
shared/crypto-standalone.o \
|
|
@@ -152,15 +152,6 @@ SERVER_OBJS= \
|
|
|
|
default: all
|
|
|
|
-enet/Makefile:
|
|
- cd enet; ./configure --enable-shared=no --enable-static=yes
|
|
-
|
|
-libenet: enet/Makefile
|
|
- $(MAKE) -C enet/ all
|
|
-
|
|
-clean-enet: enet/Makefile
|
|
- $(MAKE) -C enet/ clean
|
|
-
|
|
clean: clean-client clean-server
|
|
|
|
clean-client:
|
|
@@ -202,13 +193,13 @@ ifneq (,$(STRIP))
|
|
$(STRIP) $(WINBIN)/$(APPSERVER).exe
|
|
endif
|
|
else
|
|
-client: libenet $(CLIENT_OBJS)
|
|
+client: $(CLIENT_OBJS)
|
|
$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(APPCLIENT) $(CLIENT_OBJS) $(CLIENT_LIBS)
|
|
ifneq (,$(STRIP))
|
|
$(STRIP) $(APPCLIENT)
|
|
endif
|
|
|
|
-server: libenet $(SERVER_OBJS)
|
|
+server: $(SERVER_OBJS)
|
|
$(CXX) $(CXXFLAGS) $(LDFLAGS) -o $(APPSERVER) $(SERVER_OBJS) $(SERVER_LIBS)
|
|
ifneq (,$(STRIP))
|
|
$(STRIP) $(APPSERVER)
|
|
@@ -243,7 +234,7 @@ depend:
|
|
all: client server
|
|
|
|
include system-install.mk
|
|
-include dist.mk
|
|
+#include dist.mk
|
|
|
|
engine/engine.h.gch: shared/cube.h.gch
|
|
|