Fix build for newer gcc versions #70
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
waves at the familiar name |
5 tasks
Quix0r
reviewed
Jan 25, 2022
| @@ -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 $@ | |||
| @@ -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 | |||
There was a problem hiding this comment.
Also the ordering for MasterServer needs this fix.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In addition to fixing the build for newer gcc versions, this also makes
StarRuler2.shexecutable and adds some generated files to.gitignore.There is a commit for each change so if you do not want everything, feel free to cherry-pick what you want or ask me to drop everything you don't want.
Closes #69