diff --git a/.gitignore b/.gitignore index 8674ac84..011b8bbd 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,14 @@ *.sdf *.db-shm *.db-wal +*.a +*.o +*.d +*.bin +/source/glfw/**/CMakeCache.txt +/source/glfw/**/CMakeFiles/ +/source/glfw/**/Makefile +/source/glfw/docs/Doxyfile +/source/glfw/**/*.cmake +/source/glfw/src/config.h +/source/glfw/src/glfw3.pc diff --git a/StarRuler2.sh b/StarRuler2.sh old mode 100644 new mode 100755 diff --git a/source/linux/Makefile b/source/linux/Makefile index 023f0fd8..65ecba26 100644 --- a/source/linux/Makefile +++ b/source/linux/Makefile @@ -323,7 +323,7 @@ $(OBJDIR)/%.o: $(SRCDIR)/%.cpp #Complete binary compile $(BINDIR)/$(BIN): makelibs $(OBJ_FILES) $(LIB_FILES) $(COPY_LIBS) @mkdir -p $(BINDIR) - @$(CC) $(CXXFLAGS) $(LDFLAGS) $(OBJ_FILES) $(LIB_FILES) -o $@ + @$(CC) $(CXXFLAGS) $(OBJ_FILES) $(LIB_FILES) $(LDFLAGS) -o $@ makelibs: @mkdir -p $(BINDIR) @@ -346,7 +346,7 @@ $(BINDIR)/$(MS_BIN): $(OBJDIR)/master_server.o $(LIBDIR)/libnetwork.a $(LIBDIR)/ @$(CC) $(CXXFLAGS) -lstdc++ -lpthread -lm $^ -o $@ patcher: $(LIB_FILES) - @$(CC) $(CXXFLAGS) $(LDFLAGS) source/patcher/patcher/patcher.cpp $(LIB_FILES) -o $(BINDIR)/Patcher.bin + @$(CC) $(CXXFLAGS) source/patcher/patcher/patcher.cpp $(LIB_FILES) $(LDFLAGS) -o $(BINDIR)/Patcher.bin version: bash /source/linux/build.sh version