Skip to content

Fix Makefile warnings #67

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ProgramMax merged 1 commit into from
Mar 24, 2025
Merged

Fix Makefile warnings #67

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 14 additions & 16 deletions Projects/Make/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,20 @@ endif
PROGRAM = Build/png_cicp_editor

CXX_SRCS = \
../../Code/png_cicp_editor/EntryPoint.cpp
CXX_OBJS = $(patsubst ../../%.cpp,Build/Objects/%.o,$(CXX_SRCS))

SHARED_CXX_SRCS = \
../../Code/png_cicp_editor/Actions.cpp \
../../Code/png_cicp_editor/CICP.cpp \
../../Code/png_cicp_editor/CICPCreator.cpp \
../../Code/png_cicp_editor/CICPInserter.cpp \
../../Code/png_cicp_editor/CommandLineParameters.cpp \
../../Code/png_cicp_editor/EntryPoint.cpp \
../../Code/png_cicp_editor/Error.cpp \
../../Code/png_cicp_editor/FileReader.cpp \
../../Code/png_cicp_editor/FileWriter.cpp \
../../Code/png_cicp_editor/PNGParser.cpp
CXX_OBJS = $(patsubst ../../%.cpp,Build/Objects/%.o,$(CXX_SRCS))
SHARED_CXX_OBJS = $(patsubst ../../%.cpp,Build/Objects/%.o,$(SHARED_CXX_SRCS))

INCLUDE_PATHS = \
../../Code/png_cicp_editor \
Expand All @@ -58,15 +61,6 @@ LIBRARY_PATHS_FLAGS = $(foreach d, $(LIBRARY_PATHS), -L$d)
TEST_PROGRAM = Build/tests

TEST_CXX_SRCS = \
../../Code/png_cicp_editor/Actions.cpp \
../../Code/png_cicp_editor/CICP.cpp \
../../Code/png_cicp_editor/CICPCreator.cpp \
../../Code/png_cicp_editor/CICPInserter.cpp \
../../Code/png_cicp_editor/CommandLineParameters.cpp \
../../Code/png_cicp_editor/Error.cpp \
../../Code/png_cicp_editor/FileReader.cpp \
../../Code/png_cicp_editor/FileWriter.cpp \
../../Code/png_cicp_editor/PNGParser.cpp \
../../Code/tests/ActionsTest.cpp \
../../Code/tests/CICPTest.cpp \
../../Code/tests/CICPCreatorTest.cpp \
Expand Down Expand Up @@ -111,15 +105,19 @@ endif

all: $(PROGRAM) $(TEST_PROGRAM)

$(PROGRAM): $(CXX_OBJS)
$(CXX) $(CXX_OBJS) $(LINKER_FLAGS) -o $(PROGRAM)
$(PROGRAM): $(CXX_OBJS) $(SHARED_CXX_OBJS)
$(CXX) $(CXX_OBJS) $(SHARED_CXX_OBJS) $(LINKER_FLAGS) -o $(PROGRAM)

$(CXX_OBJS): $(CXX_SRCS)
mkdir -p $(dir $@)
$(CXX) $(CPP_FLAGS) -c $(patsubst Build/Objects/%.o,../../%.cpp,$@) -o $@

$(TEST_PROGRAM): $(TEST_CXX_OBJS)
$(CXX) $(TEST_CXX_OBJS) $(LINKER_FLAGS) -o $(TEST_PROGRAM)
$(SHARED_CXX_OBJS): $(SHARED_CXX_SRCS)
mkdir -p $(dir $@)
$(CXX) $(CPP_FLAGS) -c $(patsubst Build/Objects/%.o,../../%.cpp,$@) -o $@

$(TEST_PROGRAM): $(SHARED_CXX_OBJS) $(TEST_CXX_OBJS)
$(CXX) $(SHARED_CXX_OBJS) $(TEST_CXX_OBJS) $(LINKER_FLAGS) -o $(TEST_PROGRAM)

$(TEST_CXX_OBJS): $(TEST_CXX_SRCS)
mkdir -p $(dir $@)
Expand All @@ -128,6 +126,6 @@ $(TEST_CXX_OBJS): $(TEST_CXX_SRCS)
.PHONY: clean
distclean: clean
clean:
for file in $(PROGRAM) $(CXX_OBJS) $(TEST_PROGRAM) $(TEST_CXX_OBJS) ; do \
for file in $(PROGRAM) $(CXX_OBJS) $(SHARED_CXX_OBJS) $(TEST_PROGRAM) $(TEST_CXX_OBJS) ; do \
rm $${file} ; \
done
Loading