Fix Linux build

Author: dannye

.github/workflows/main.yml

@@ -27,7 +27,7 @@ jobs:
       - name: Install FLTK
         working-directory: lib/fltk
         run: |
-          cmake -D CMAKE_INSTALL_PREFIX="$(realpath "$PWD/../..")" -D CMAKE_BUILD_TYPE=Release -D FLTK_GRAPHICS_CAIRO=1 -D FLTK_BACKEND_WAYLAND=0
+          cmake -D CMAKE_INSTALL_PREFIX="$(realpath "$PWD/../..")" -D CMAKE_BUILD_TYPE=Release -D FLTK_GRAPHICS_CAIRO=1 -D FLTK_BACKEND_WAYLAND=0 -D FLTK_USE_SYSTEM_LIBPNG=0 -D FLTK_USE_SYSTEM_ZLIB=0
           make
           make install
 

INSTALL.md

@@ -70,7 +70,7 @@ cd polished-map
 # Build FLTK 1.4.0
 git clone --branch release-1.4.0rc1 --depth 1 https://github.com/fltk/fltk.git lib/fltk
 pushd lib/fltk
-cmake -D CMAKE_INSTALL_PREFIX="$(realpath "$PWD/../..")" -D CMAKE_BUILD_TYPE=Release -D FLTK_GRAPHICS_CAIRO=1 -D FLTK_BACKEND_WAYLAND=0
+cmake -D CMAKE_INSTALL_PREFIX="$(realpath "$PWD/../..")" -D CMAKE_BUILD_TYPE=Release -D FLTK_GRAPHICS_CAIRO=1 -D FLTK_BACKEND_WAYLAND=0 -D FLTK_USE_SYSTEM_LIBPNG=0 -D FLTK_USE_SYSTEM_ZLIB=0
 make
 make install
 popd

Makefile

@@ -16,13 +16,13 @@ bindir = bin
 
 fltk-config = $(bindir)/fltk-config
 
-CXXFLAGS = -std=c++17 -I$(srcdir) -I$(resdir) $(shell $(fltk-config) --use-images --cxxflags)
-LDFLAGS = $(shell $(fltk-config) --use-images --ldflags) $(shell pkg-config --libs libpng xpm)
+CXXFLAGS := -std=c++17 -I$(srcdir) -I$(resdir) $(shell $(fltk-config) --use-images --cxxflags) $(CXXFLAGS)
+LDFLAGS := $(shell $(fltk-config) --use-images --ldstaticflags) $(shell pkg-config --libs xpm) $(LDFLAGS)
 
-RELEASEFLAGS = -DNDEBUG -O3 -flto -march=native
+RELEASEFLAGS = -DNDEBUG -O3 -flto
 DEBUGFLAGS = -DDEBUG -D_DEBUG -O0 -g -ggdb3 -Wall -Wextra -pedantic -Wno-unknown-pragmas -Wno-sign-compare -Wno-unused-parameter
 
-COMMON = $(wildcard $(srcdir)/*.h) $(wildcard $(resdir)/*.xpm)
+COMMON = $(wildcard $(srcdir)/*.h) $(wildcard $(resdir)/*.xpm) $(resdir)/help.html
 SOURCES = $(wildcard $(srcdir)/*.cpp)
 OBJECTS = $(SOURCES:$(srcdir)/%.cpp=$(tmpdir)/%.o)
 DEBUGOBJECTS = $(SOURCES:$(srcdir)/%.cpp=$(debugdir)/%.o)
@@ -39,19 +39,19 @@ all: $(polishedmap)
 $(polishedmap): release
 $(polishedmapd): debug
 
-release: CXXFLAGS += $(RELEASEFLAGS)
+release: CXXFLAGS := $(RELEASEFLAGS) $(CXXFLAGS)
 release: $(TARGET)
 
-debug: CXXFLAGS += $(DEBUGFLAGS)
+debug: CXXFLAGS := $(DEBUGFLAGS) $(CXXFLAGS)
 debug: $(DEBUGTARGET)
 
 $(TARGET): $(OBJECTS)
 	@mkdir -p $(@D)
-	$(LD) -o $@ $^ $(LDFLAGS)
+	$(LD) -o $@ $^ $(CXXFLAGS) $(LDFLAGS)
 
 $(DEBUGTARGET): $(DEBUGOBJECTS)
 	@mkdir -p $(@D)
-	$(LD) -o $@ $^ $(LDFLAGS)
+	$(LD) -o $@ $^ $(CXXFLAGS) $(LDFLAGS)
 
 $(tmpdir)/%.o: $(srcdir)/%.cpp $(COMMON)
 	@mkdir -p $(@D)

src/block-window.cpp

@@ -207,7 +207,7 @@ void Block_Window::metatile(const Metatile *mt, bool has_collisions, bool bin_co
 				cin->activate();
 			}
 			else {
-				cin->value(NULL);
+				cin->value(nullptr);
 				cin->deactivate();
 			}
 			cin->insert_position(0);