mirror of
https://github.com/RGBCube/serenity
synced 2025-07-30 03:57:45 +00:00
Ports: Return nesalizer
to upstream
This makes https://github.com/SerenityPorts/nesalizer obsolete. The patch that hardcoded the SDL2 location is removed. The the patches to the `Makefile` are quashed. A new install function is added.
This commit is contained in:
parent
317ca37dc6
commit
81a2f09a80
5 changed files with 108 additions and 5 deletions
42
Ports/nesalizer/patches/0001-Add-Serenity-to-Makefile.patch
Normal file
42
Ports/nesalizer/patches/0001-Add-Serenity-to-Makefile.patch
Normal file
|
@ -0,0 +1,42 @@
|
|||
From 9a0103cf47963ff94d97885787993048cc5c4680 Mon Sep 17 00:00:00 2001
|
||||
From: Dan MacDonald <allcoms@gmail.com>
|
||||
Date: Sun, 8 Dec 2019 17:30:52 +0000
|
||||
Subject: [PATCH 1/2] Add Serenity to Makefile
|
||||
|
||||
- Add `-lSDL2 -lgui -lipc -lgfx -lcore -lpthread -lregex`
|
||||
- Disable RTTI
|
||||
---
|
||||
Makefile | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 527a3d0..fa1b849 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -58,7 +58,7 @@ c_objects = $(addprefix $(BUILD_DIR)/,$(c_sources:=.o))
|
||||
objects = $(c_objects) $(cpp_objects)
|
||||
deps = $(addprefix $(BUILD_DIR)/,$(c_sources:=.d) $(cpp_sources:=.d))
|
||||
|
||||
-LDLIBS := $(shell sdl2-config --libs) -lrt
|
||||
+LDLIBS := -lSDL2 -lgui -lipc -lgfx -lcore -lpthread -lregex
|
||||
|
||||
ifeq ($(INCLUDE_DEBUGGER),1)
|
||||
LDLIBS += -lreadline
|
||||
@@ -105,12 +105,12 @@ else ifneq ($(MAKECMDGOALS),clean)
|
||||
endif
|
||||
|
||||
ifneq ($(findstring debug,$(CONF)),)
|
||||
- compile_flags += -ggdb
|
||||
+ compile_flags += -ggdb -fno-rtti
|
||||
endif
|
||||
ifneq ($(findstring release,$(CONF)),)
|
||||
# Including -Ofast when linking (by including $(optimizations)) gives a
|
||||
# different binary size. Might be worth investigating why.
|
||||
- compile_flags += $(optimizations) -DOPTIMIZING
|
||||
+ compile_flags += $(optimizations) -DOPTIMIZING -fno-rtti
|
||||
link_flags += $(optimizations) -fuse-linker-plugin
|
||||
endif
|
||||
|
||||
--
|
||||
2.36.1
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue