Merge branch 'master' of https://github.com/OpenSRProject/OpenStarRuler

.github/workflows/build.yml

@@ -63,6 +63,7 @@ jobs:
   deploy:
     name: Deployment
     runs-on: ubuntu-20.04
+    if: github.ref == 'refs/heads/master'
 
     needs:
     - windows

.gitignore

@@ -14,4 +14,6 @@
 *.db-shm
 *.db-wal
 *.iobj
-*.ipdb
+*.ipdb
+*.o
+*.d

README.md

@@ -37,7 +37,7 @@ make sure the `Working Directory` configuration property is set to your working
 ### Building on Linux
 To build the binary files on Linux,
 make sure your working directory is set to the main directory (the root folder of this repository),
-then run `make -f source/linux/Makefile compile` to compile the binaries.
+then run `make` to compile the binaries.
 
 Several dependencies are required to build on Linux, including: libpng, zlib,
 GLEW, GLU, freetype2, libvorbisfile, libvorbis, libogg, libopenal, libbz2,

source/game/main/initialization.cpp

@@ -346,7 +346,7 @@ bool initGlobal(bool loadGraphics, bool createWindow) {
 	//Add mod sources
 	print("Registering mods");
 	devices.mods.registerDirectory("mods");
-	devices.mods.registerDirectory(getProfileRoot() + "mods");
+	devices.mods.registerDirectory(path_join(getProfileRoot(), "mods"));
 	devices.mods.registerDirectory("../../workshop/content/282590");
 
 	//Shortcut for the scene tree

source/linux/Makefile

@@ -304,6 +304,10 @@ CPP_FILES = $(addprefix $(SRCDIR)/, $(SOURCES))
 OBJ_FILES = $(addprefix $(OBJDIR)/, $(SOURCES:.cpp=.o))
 DEP_FILES = $(addprefix $(OBJDIR)/, $(SOURCES:.cpp=.d))
 
+.PHONY: compile master_server makelibs patcher version clean_angelscript angelscript clean_glfw glfw clean_sound sound clean_as_addons as_addons clean_libircclient libircclient clean_os os clean_util util clean_network network clean_code clean
+
+compile:
+
 -include $(DEP_FILES)
 
 compile: $(DEP_FILES) $(BINDIR)/$(BIN)