YGGverse/hlsdk-portable
1
0
Fork 0
mirror of https://github.com/YGGverse/hlsdk-portable.git synced 2025-01-13 00:18:06 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31 from FreeSlave/gs_aware_build_systems

Browse Source 
Add new input files and goldsource support flag to client makefiles
This commit is contained in:
Alibek Omarov 2017-12-04 20:19:39 +03:00 committed by GitHub
commit 34c577572b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cl_dll/Android.mk
View File

@ -68,6 +68,8 @@ SRCS+=./hud_spectator.cpp
SRCS+=./hud_update.cpp SRCS+=./hud_update.cpp
SRCS+=./in_camera.cpp SRCS+=./in_camera.cpp
SRCS+=./input.cpp SRCS+=./input.cpp
SRCS+=./input_goldsource.cpp
SRCS+=./input_mouse.cpp
#SRCS+=./inputw32.cpp #SRCS+=./inputw32.cpp
SRCS+=./menu.cpp SRCS+=./menu.cpp
SRCS+=./message.cpp SRCS+=./message.cpp
@ -100,6 +102,11 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/. \
$(LOCAL_PATH)/../pm_shared $(LOCAL_PATH)/../pm_shared
LOCAL_CFLAGS += $(DEFINES) $(INCLUDES) LOCAL_CFLAGS += $(DEFINES) $(INCLUDES)
ifeq ($(GOLDSOURCE_SUPPORT),1)
DEFINES += -DGOLDSOURCE_SUPPORT
LOCAL_LDLIBS += -lSDL2
endif
LOCAL_SRC_FILES := $(SRCS) $(SRCS_C) LOCAL_SRC_FILES := $(SRCS) $(SRCS_C)
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

11
cl_dll/Makefile
View File

@ -45,7 +45,8 @@ SRCS+=./hud_spectator.cpp
SRCS+=./hud_update.cpp SRCS+=./hud_update.cpp
SRCS+=./in_camera.cpp SRCS+=./in_camera.cpp
SRCS+=./input.cpp SRCS+=./input.cpp
#SRCS+=./inputw32.cpp SRCS+=./input_mouse.cpp
SRCS+=./input_goldsource.cpp
SRCS+=./menu.cpp SRCS+=./menu.cpp
SRCS+=./message.cpp SRCS+=./message.cpp
SRCS+=./overview.cpp SRCS+=./overview.cpp
@ -72,9 +73,13 @@ CFLAGS = -m32
OBJS = $(SRCS:.cpp=.o) $(SRCS_C:.c=.o) OBJS = $(SRCS:.cpp=.o) $(SRCS_C:.c=.o)
LIBS=-lm LIBS=-lm
ifeq ($(GOLDSOURCE_SUPPORT),1)
DEFINES += -DGOLDSOURCE_SUPPORT
LIBS += -lSDL2
endif
ifeq ($(shell uname -s),Linux) ifeq ($(shell uname -s),Linux)
LIBS=$(LIBS) -ldl LIBS += -ldl
endif endif
%.o : %.c %.o : %.c
@ -83,7 +88,7 @@ endif
%.o : %.cpp %.o : %.cpp
$(CXX) $(CFLAGS) $(INCLUDES) $(DEFINES) -fPIC -c $< -o $@ $(CXX) $(CFLAGS) $(INCLUDES) $(DEFINES) -fPIC -c $< -o $@
client.so : $(OBJS) client.so : $(OBJS)
$(CXX) $(OBJS) -o client.so -shared -Wl,--no-undefined -fPIC $(LIBS) $(CXX) $(CFLAGS) $(OBJS) -o client.so -shared -Wl,--no-undefined -fPIC $(LIBS)
clean: clean:
$(RM) $(OBJS) $(RM) $(OBJS)

14
cl_dll/cl_dll.dsp
View File

@ -300,7 +300,15 @@ SOURCE=.\input.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\inputw32.cpp SOURCE=.\input_goldsource.cpp
# End Source File
# Begin Source File
SOURCE=.\input_mouse.cpp
# End Source File
# Begin Source File
SOURCE=.\input_xash3d.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
@ -513,6 +521,10 @@ SOURCE=.\in_defs.h
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\input_mouse.h
# End Source File
# Begin Source File
SOURCE=..\common\itrackeruser.h SOURCE=..\common\itrackeruser.h
# End Source File # End Source File
# Begin Source File # Begin Source File