aboutsummaryrefslogtreecommitdiff
path: root/GNUmakefile
diff options
context:
space:
mode:
authorBossCode45 <boss@tehbox.org>2025-06-27 17:58:36 +1200
committerBossCode45 <boss@tehbox.org>2025-07-24 12:48:21 +1200
commit078b4e08fe3bccb7424dac76e158bf8bf48a182d (patch)
treea4f84f3fc346053c1c41990be4cc0867ab206cf5 /GNUmakefile
parenteed164fa72297efb69b624f3c58cb5deb339a974 (diff)
downloadtehimage-078b4e08fe3bccb7424dac76e158bf8bf48a182d.tar.gz
tehimage-078b4e08fe3bccb7424dac76e158bf8bf48a182d.zip
feat: Made it so that you can now convert between image subclasses
Also added the bitmap image subclass note: this is pretty hacky in how it works
Diffstat (limited to 'GNUmakefile')
-rw-r--r--GNUmakefile15
1 files changed, 8 insertions, 7 deletions
diff --git a/GNUmakefile b/GNUmakefile
index d42f0cf..af8403a 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -7,9 +7,9 @@ TEST_SRC_DIR := ./test
# Flags
CXX := g++
-CXXFLAGS := -fsanitize=address -g
+CXXFLAGS := -std=c++20 -fsanitize=address -g
LINKFLAGS := -static-libasan
-TEST_CXXFLAGS := -I$(INCLUDE_DIR) -fsanitize=address -g
+TEST_CXXFLAGS := -std=c++20 -I$(INCLUDE_DIR) -fsanitize=address -g
TEST_LINKFLAGS := -L$(LIB_DIR) -ltehimage -static-libasan
# Outputs
@@ -29,7 +29,7 @@ TEST_OBJS = $(subst $(TEST_SRC_DIR),$(OBJS_DIR), $(patsubst %.cpp,%.o,$(TEST_SOU
$(LIB): $(INCLUDE_HEADERS) $(OBJS)
$(CXX) $(OBJS) $(CXXFLAGS) $(LINKFLAGS) -shared -o $(LIB)
-$(OBJS_DIR)/%.o: $(SOURCE_DIR)/%.cpp
+$(OBJS_DIR)/%.o: $(SOURCE_DIR)/%.cpp $(SOURCE_DIR)/%.h
$(CXX) $(CXXFLAGS) -c $< -o $@
$(INCLUDE_DIR)/%.h: $(SOURCE_DIR)/%.h lib
@@ -52,7 +52,8 @@ clean:
test: $(TEST)
-$(OBJS_DIR)/reader.o: $(SOURCE_DIR)/reader.cpp $(SOURCE_DIR)/reader.h $(SOURCE_DIR)/debug.h
-$(OBJS_DIR)/image.o: $(SOURCE_DIR)/image.cpp $(SOURCE_DIR)/image.h
-$(OBJS_DIR)/PNGImage.o: $(SOURCE_DIR)/PNGImage.cpp $(SOURCE_DIR)/PNGImage.h $(SOURCE_DIR)/debug.h $(SOURCE_DIR)/image.h $(SOURCE_DIR)/puff.h
-$(OBJS_DIR)/zlib.o: $(SOURCE_DIR)/zlib.cpp $(SOURCE_DIR)/zlib.h
+$(OBJS_DIR)/reader.o: $(SOURCE_DIR)/debug.h
+$(OBJS_DIR)/image.o:
+$(OBJS_DIR)/PNGImage.o: $(SOURCE_DIR)/debug.h $(SOURCE_DIR)/image.h
+$(OBJS_DIR)/BMPImage.o: $(SOURCE_DIR)/image.h
+$(OBJS_DIR)/zlib.o: