nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add glez and xoverlay as submodules

Browse Source
This commit is contained in:
nullifiedcat 2017-12-08 09:10:55 +03:00
parent cf7e4ec91f
commit ee5467a462
4 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@ -7,3 +7,9 @@
[submodule "ucccccp"] [submodule "ucccccp"]
path = ucccccp path = ucccccp
url = https://github.com/nullifiedcat/ucccccp url = https://github.com/nullifiedcat/ucccccp
[submodule "libxoverlay"]
path = libxoverlay
url = https://github.com/nullifiedcat/libxoverlay
[submodule "libglez"]
path = libglez
url = https://github.com/nullifiedcat/libglez

1
libglez Submodule

@ -0,0 +1 @@
Subproject commit c0f714373c4cabfb6593198679facd3f4db08eaf

1
libxoverlay Submodule

@ -0,0 +1 @@
Subproject commit 58c1b2a45c63f09bea1ecbcf486349881fbd4a82

14
makefile
View File

@ -51,6 +51,9 @@ RES_DIR=res
OUT_DIR=bin OUT_DIR=bin
TARGET = $(OUT_DIR)/$(OUT_NAME) TARGET = $(OUT_DIR)/$(OUT_NAME)
LIBGLEZ=libglez/bin32/libglez.so
LIBXOVERLAY=libxoverlay/bin32/libxoverlay.so
INCLUDES=-I. -Iinclude -Iucccccp -isystem/usr/include/c++/6.3.1 -isystem$(SSDK_DIR)/public -isystem$(SSDK_DIR)/mathlib -isystem$(SSDK_DIR)/common -isystem$(SSDK_DIR)/public/tier1 -isystem$(SSDK_DIR)/public/tier0 -isystem$(SSDK_DIR) INCLUDES=-I. -Iinclude -Iucccccp -isystem/usr/include/c++/6.3.1 -isystem$(SSDK_DIR)/public -isystem$(SSDK_DIR)/mathlib -isystem$(SSDK_DIR)/common -isystem$(SSDK_DIR)/public/tier1 -isystem$(SSDK_DIR)/public/tier0 -isystem$(SSDK_DIR)
LDLIBS=-static -l:libc.so.6 -l:libstdc++.so.6 -l:libtier0.so -l:libvstdlib.so LDLIBS=-static -l:libc.so.6 -l:libstdc++.so.6 -l:libtier0.so -l:libvstdlib.so
LDFLAGS=-shared -L$(realpath $(LIB_DIR)) LDFLAGS=-shared -L$(realpath $(LIB_DIR))
@ -99,7 +102,8 @@ endif
ifeq ($(ENABLE_VISUALS),1) ifeq ($(ENABLE_VISUALS),1)
INCLUDES+=-Ixoverlay INCLUDES+=-Ixoverlay
LDLIBS+=-lssl -l:libSDL2-2.0.so.0 -l:libGLEW.so -lxoverlay -lglez LDFLAGS+=-L$(realpath libglez/bin32) -L$(realpath libxoverlay/bin32)
LDLIBS+=-lssl -l:libSDL2-2.0.so.0 -l:libGLEW.so -lglez -loverlay
CXXFLAGS+=$(shell sdl2-config --cflags) CXXFLAGS+=$(shell sdl2-config --cflags)
CFLAGS+=$(shell sdl2-config --cflags) CFLAGS+=$(shell sdl2-config --cflags)
else else
@ -160,6 +164,12 @@ src/sdk/utlbuffer.o : CXXFLAGS+=-w
# end of 3rd party sources # end of 3rd party sources
$(LIBGLEZ):
$(MAKE) -C libglez -e ARCH=32
$(LIBXOVERLAY):
$(MAKE) -C libxoverlay -e ARCH=32
.cpp.o: .cpp.o:
@echo Compiling $< @echo Compiling $<
$(CXX) $(CXXFLAGS) -c $< -o $@ $(CXX) $(CXXFLAGS) -c $< -o $@
@ -171,7 +181,7 @@ src/sdk/utlbuffer.o : CXXFLAGS+=-w
%.d: %.cpp %.d: %.cpp
@$(CXX) -M $(CXXFLAGS) $< > $@ @$(CXX) -M $(CXXFLAGS) $< > $@
$(TARGET): $(OBJECTS) $(TARGET): $(OBJECTS) $(LIBGLEZ) $(LIBXOVERLAY)
@echo Building cathook @echo Building cathook
$(LD) -o $@ $(LDFLAGS) $(OBJECTS) $(LDLIBS) $(LD) -o $@ $(LDFLAGS) $(OBJECTS) $(LDLIBS)
ifndef BUILD_DEBUG ifndef BUILD_DEBUG