bionickatana/starruler-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changes for linux compile.

Browse Source
This commit is contained in:
Lucas de Vries
2018-07-17 15:43:13 +02:00
parent cc307720ff
commit badcf74513
4 changed files with 102 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/game/os/driver.h
+7 -6
View File
@@ -64,11 +64,12 @@ struct DriverCallbacks_2 {
}
//Removes a callback previously added to the list
void remove(cb func) {
/*void remove(cb func) {
callbacks.remove_if([func](cb f) {
return func.template target<bool(Arg0,Arg1)>() == f.template target<bool(Arg0,Arg1)>();
});
}
}*/
//Calls each callback in order, stopping if true is returned
void operator()(Arg0 arg0, Arg1 arg1) {
for(auto i = callbacks.begin(), end = callbacks.end(); i != end; ++i)
@@ -91,11 +92,11 @@ struct DriverCallbacks_1 {
}
//Removes a callback previously added to the list
void remove(cb func) {
/*void remove(cb func) {
callbacks.remove_if([func](cb f) {
return func.template target<bool(Arg0)>() == f.template target<bool(Arg0)>();
});
}
}*/
//Calls each callback in order, stopping if true is returned
void operator()(Arg0 arg0) {
for(auto i = callbacks.begin(), end = callbacks.end(); i != end; ++i)
@@ -117,11 +118,11 @@ struct DriverCallbacks {
}
//Removes a callback previously added to the list
void remove(cb func) {
/*void remove(cb func) {
callbacks.remove_if([func](cb f) {
return func.template target<bool()>() == f.template target<bool()>();
});
}
}*/
//Calls each callback in order, stopping if true is returned
void operator()() {
source/linux/Makefile
+9 -24
View File
@@ -84,11 +84,8 @@ CXXFLAGS += -I./source/libircclient/include
CXXFLAGS += -I./source/util/include -I./source/network/include
CXXFLAGS += -I./source/rapidjson/include
ifdef NSTEAM
CXXFLAGS += -DNSTEAM
else
CXXFLAGS += -I./source/steam
endif
NSTEAM=1
CXXFLAGS += -DNSTEAM
ifndef GCC48
CXXFLAGS += -fdiagnostics-color=auto
@@ -108,8 +105,6 @@ ifeq ($(UNAME), Darwin)
CXXFLAGS += -framework OpenGL -framework Cocoa -framework IOKit
CXXFLAGS += -framework OpenAL
STEAMLIBDIR = ./source/osx/lib
LDFLAGS += -lcurl
else
ifndef DEBUG
@@ -117,11 +112,6 @@ else
endif
LDFLAGS += -lGL -lGLU -lX11 -lXrandr -lXxf86vm -lXi -lopenal -lcurl
ifeq ($(ARCH), 32)
STEAMLIBDIR = ./source/linux/lib32
else
STEAMLIBDIR = ./source/linux/lib64
endif
endif
#Libraries
@@ -129,10 +119,6 @@ LDFLAGS += -lstdc++ -lGLEW -lpng -lz -lpthread
LDFLAGS += -lm -lfreetype
LDFLAGS += -lvorbisfile
ifndef NSTEAM
LDFLAGS += -L$(STEAMLIBDIR) -lsteam_api
endif
LIB_FILES += $(LIBDIR)/libangelscript.a
LIB_FILES += $(LIBDIR)/libglfw3.a
LIB_FILES += $(LIBDIR)/libsound.a
@@ -142,7 +128,8 @@ LIB_FILES += $(LIBDIR)/libos.a
LIB_FILES += $(LIBDIR)/libnetwork.a
LIB_FILES += $(LIBDIR)/libutil.a
ifndef DEBUG
NOCOPYLIBS=1
ifndef NOCOPYLIBS
ifeq ($(UNAME), Darwin)
COPY_LIBS += lib/libGLEW.1.10.0.dylib
COPY_LIBS += opt/libpng/lib/libpng16.16.dylib
@@ -195,7 +182,6 @@ SOURCES = \
main/tick.cpp \
main/console.cpp \
main/save_load.cpp \
main/steam_platform.cpp \
\
mods/mod_manager.cpp \
\
@@ -334,7 +320,6 @@ $(OBJDIR)/%.o: $(SRCDIR)/%.cpp
#Complete binary compile
$(BINDIR)/$(BIN): makelibs $(OBJ_FILES) $(LIB_FILES) $(COPY_LIBS)
@mkdir -p $(BINDIR)
@cp $(STEAMLIBDIR)/libsteam_api.* $(BINDIR)/
@$(CC) $(CXXFLAGS) $(LDFLAGS) $(OBJ_FILES) $(LIB_FILES) -o $@
makelibs:
@@ -361,14 +346,14 @@ patcher: $(LIB_FILES)
@$(CC) $(CXXFLAGS) $(LDFLAGS) source/patcher/patcher/patcher.cpp $(LIB_FILES) -o $(BINDIR)/Patcher.bin
version:
./source/linux/build.sh version
bash /source/linux/build.sh version
#Library builds
$(LIBDIR)/libangelscript.a:
./source/linux/build.sh $(ARCH) $(BUILDTYPE) angelscript
bash source/linux/build.sh $(ARCH) $(BUILDTYPE) angelscript
$(LIBDIR)/libglfw3.a:
./source/linux/build.sh $(ARCH) $(BUILDTYPE) glfw
bash source/linux/build.sh $(ARCH) $(BUILDTYPE) glfw
#$(LIBDIR)/libbreakpad_client.a:
#./source/linux/build.sh $(ARCH) $(BUILDTYPE) breakpad
@@ -395,12 +380,12 @@ $(LIBDIR)/libutil.a:
clean_angelscript:
rm -f $(LIBDIR)/libangelscript.a
angelscript: clean_angelscript
./source/linux/build.sh $(ARCH) $(BUILDTYPE) angelscript
bash source/linux/build.sh $(ARCH) $(BUILDTYPE) angelscript
clean_glfw:
rm -f $(LIBDIR)/libglfw3.a
glfw:
./source/linux/build.sh $(ARCH) $(BUILDTYPE) glfw
bash source/linux/build.sh $(ARCH) $(BUILDTYPE) glfw
#clean_breakpad:
#rm -f $(LIBDIR)/libbreakpad_client.a