mirror of
https://gitdl.cn/https://github.com/chakralinux/desktop.git
synced 2025-02-10 00:57:16 +08:00
46 lines
1.5 KiB
Diff
46 lines
1.5 KiB
Diff
--- Makefile.orig 2012-08-31 05:59:06.000000000 +0000
|
|
+++ Makefile 2012-09-01 08:54:52.276484541 +0000
|
|
@@ -9,7 +9,7 @@
|
|
PLATFORM= $(shell uname -s)
|
|
PLATFORM_SUFFIX=_native
|
|
|
|
-INCLUDES= -Ishared -Iengine -Igame -Ienet/include
|
|
+INCLUDES= -Ishared -Iengine -Igame -I/usr/share/enet/include
|
|
|
|
STRIP=
|
|
ifeq (,$(findstring -g,$(CXXFLAGS)))
|
|
@@ -42,7 +42,7 @@
|
|
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_LIBS= -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL
|
|
endif
|
|
ifeq ($(PLATFORM),Linux)
|
|
CLIENT_LIBS+= -lrt
|
|
@@ -113,7 +113,7 @@
|
|
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= -lenet -lz
|
|
endif
|
|
SERVER_OBJS= \
|
|
shared/crypto-standalone.o \
|
|
@@ -178,13 +178,13 @@
|
|
$(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)
|