diff --git a/Applications/About/Makefile b/Applications/About/Makefile index a3170934defe21..323301360ea203 100644 --- a/Applications/About/Makefile +++ b/Applications/About/Makefile @@ -1,20 +1,11 @@ +include ../../Makefile.common + OBJS = \ main.o APP = About -STANDARD_FLAGS = -std=c++17 -WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough -FLAVOR_FLAGS = -fno-exceptions -fno-rtti -OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I../.. -I. -I../../LibC - -DEFINES = -DSANITIZE_PTRS -DUSERLAND - -CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) -CXX = i686-pc-serenity-g++ -LD = i686-pc-serenity-g++ -LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI +DEFINES += -DUSERLAND all: $(APP) diff --git a/Applications/Downloader/Makefile b/Applications/Downloader/Makefile index 0a16ef941900c5..cfd0bb3011a14e 100644 --- a/Applications/Downloader/Makefile +++ b/Applications/Downloader/Makefile @@ -1,21 +1,11 @@ +include ../../Makefile.common + OBJS = \ main.o APP = Downloader -STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation -WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough -FLAVOR_FLAGS = -fno-exceptions -fno-rtti -OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I../../Servers -I../.. -I. -I../../LibC - -DEFINES = -DSANITIZE_PTRS -DUSERLAND - -CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) -CXX = i686-pc-serenity-g++ -LD = i686-pc-serenity-g++ -AR = i686-pc-serenity-ar -LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI +DEFINES += -DUSERLAND all: $(APP) diff --git a/Applications/FileManager/Makefile b/Applications/FileManager/Makefile index 51209560e4b89c..059c1a282ea181 100644 --- a/Applications/FileManager/Makefile +++ b/Applications/FileManager/Makefile @@ -1,3 +1,5 @@ +include ../../Makefile.common + OBJS = \ DirectoryModel.o \ DirectoryView.o \ @@ -5,18 +7,7 @@ OBJS = \ APP = FileManager -STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation -WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough -FLAVOR_FLAGS = -fno-exceptions -fno-rtti -OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I../.. -I../../Servers -I. -I../../LibC - -DEFINES = -DSANITIZE_PTRS -DUSERLAND - -CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) -CXX = i686-pc-serenity-g++ -LD = i686-pc-serenity-g++ -LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI +DEFINES += -DUSERLAND all: $(APP) diff --git a/Applications/FontEditor/Makefile b/Applications/FontEditor/Makefile index c4190895eed9db..b044d72878d9f1 100644 --- a/Applications/FontEditor/Makefile +++ b/Applications/FontEditor/Makefile @@ -1,3 +1,5 @@ +include ../../Makefile.common + OBJS = \ FontEditor.o \ GlyphMapWidget.o \ @@ -6,19 +8,7 @@ OBJS = \ APP = FontEditor -STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation -WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough -FLAVOR_FLAGS = -fno-exceptions -fno-rtti -OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I../.. -I. -I../../LibC - -DEFINES = -DSANITIZE_PTRS -DUSERLAND - -CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) -CXX = i686-pc-serenity-g++ -LD = i686-pc-serenity-g++ -AR = i686-pc-serenity-ar -LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI +DEFINES += -DUSERLAND all: $(APP) diff --git a/Applications/IRCClient/Makefile b/Applications/IRCClient/Makefile index c61164768cfb47..971f1dcde2f286 100644 --- a/Applications/IRCClient/Makefile +++ b/Applications/IRCClient/Makefile @@ -1,3 +1,5 @@ +include ../../Makefile.common + OBJS = \ IRCClient.o \ IRCChannel.o \ @@ -12,19 +14,7 @@ OBJS = \ APP = IRCClient -STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation -WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough -FLAVOR_FLAGS = -fno-exceptions -fno-rtti -OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I../../Servers -I../.. -I. -I../../LibC - -DEFINES = -DSANITIZE_PTRS -DUSERLAND - -CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) -CXX = i686-pc-serenity-g++ -LD = i686-pc-serenity-g++ -AR = i686-pc-serenity-ar -LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI +DEFINES += -DUSERLAND all: $(APP) diff --git a/Applications/Launcher/Makefile b/Applications/Launcher/Makefile index 7062a8f26622f7..8a39790710e72f 100644 --- a/Applications/Launcher/Makefile +++ b/Applications/Launcher/Makefile @@ -1,20 +1,11 @@ +include ../../Makefile.common + OBJS = \ main.o APP = Launcher -STANDARD_FLAGS = -std=c++17 -WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough -FLAVOR_FLAGS = -fno-exceptions -fno-rtti -OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I../.. -I. -I../../LibC - -DEFINES = -DSANITIZE_PTRS -DUSERLAND - -CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) -CXX = i686-pc-serenity-g++ -LD = i686-pc-serenity-g++ -LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI +DEFINES += -DUSERLAND all: $(APP) diff --git a/Applications/ProcessManager/Makefile b/Applications/ProcessManager/Makefile index 6b6f007f5f1e17..25c71068f23522 100644 --- a/Applications/ProcessManager/Makefile +++ b/Applications/ProcessManager/Makefile @@ -1,3 +1,5 @@ +include ../../Makefile.common + OBJS = \ ProcessModel.o \ ProcessTableView.o \ @@ -6,18 +8,7 @@ OBJS = \ APP = ProcessManager -STANDARD_FLAGS = -std=c++17 -WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough -FLAVOR_FLAGS = -fno-exceptions -fno-rtti -OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I../.. -I. -I../../LibC - -DEFINES = -DSANITIZE_PTRS -DUSERLAND - -CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) -CXX = i686-pc-serenity-g++ -LD = i686-pc-serenity-g++ -LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI +DEFINES += -DUSERLAND all: $(APP) diff --git a/Applications/Taskbar/Makefile b/Applications/Taskbar/Makefile index 0c412c30397483..4f1ca2d20c95b4 100644 --- a/Applications/Taskbar/Makefile +++ b/Applications/Taskbar/Makefile @@ -1,3 +1,5 @@ +include ../../Makefile.common + OBJS = \ TaskbarWindow.o \ WindowList.o \ @@ -5,18 +7,7 @@ OBJS = \ APP = Taskbar -STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation -WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough -FLAVOR_FLAGS = -fno-exceptions -fno-rtti -OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I../.. -I../../Servers -I. -I../../LibC - -DEFINES = -DSANITIZE_PTRS -DUSERLAND - -CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) -CXX = i686-pc-serenity-g++ -LD = i686-pc-serenity-g++ -LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI +DEFINES += -DUSERLAND all: $(APP) diff --git a/Applications/Terminal/Makefile b/Applications/Terminal/Makefile index fddf7f11bbb384..04e40c01e235e8 100644 --- a/Applications/Terminal/Makefile +++ b/Applications/Terminal/Makefile @@ -1,21 +1,12 @@ +include ../../Makefile.common + OBJS = \ Terminal.o \ main.o APP = Terminal -STANDARD_FLAGS = -std=c++17 -WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough -FLAVOR_FLAGS = -fno-exceptions -fno-rtti -OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I../.. -I. -I../../LibC - -DEFINES = -DSANITIZE_PTRS -DUSERLAND - -CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) -CXX = i686-pc-serenity-g++ -LD = i686-pc-serenity-g++ -LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI +DEFINES += -DUSERLAND all: $(APP) diff --git a/Applications/TextEditor/Makefile b/Applications/TextEditor/Makefile index 9d608c49baf7b1..4c8dc105c7d9fc 100644 --- a/Applications/TextEditor/Makefile +++ b/Applications/TextEditor/Makefile @@ -1,20 +1,11 @@ +include ../../Makefile.common + OBJS = \ main.o APP = TextEditor -STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation -WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough -FLAVOR_FLAGS = -fno-exceptions -fno-rtti -OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I../.. -I. -I../../LibC - -DEFINES = -DSANITIZE_PTRS -DUSERLAND - -CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) -CXX = i686-pc-serenity-g++ -LD = i686-pc-serenity-g++ -LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI +DEFINES += -DUSERLAND all: $(APP) diff --git a/Applications/VisualBuilder/Makefile b/Applications/VisualBuilder/Makefile index 5188ef20838cea..27f8dcdc5d1d6d 100644 --- a/Applications/VisualBuilder/Makefile +++ b/Applications/VisualBuilder/Makefile @@ -1,3 +1,5 @@ +include ../../Makefile.common + OBJS = \ VBForm.o \ VBWidget.o \ @@ -9,18 +11,7 @@ OBJS = \ APP = VisualBuilder -STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation -WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough -FLAVOR_FLAGS = -fno-exceptions -fno-rtti -OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I../.. -I. -I../../LibC - -DEFINES = -DSANITIZE_PTRS -DUSERLAND - -CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) -CXX = i686-pc-serenity-g++ -LD = i686-pc-serenity-g++ -LDFLAGS = -L../../LibC -L../../LibCore -L../../LibGUI +DEFINES += -DUSERLAND all: $(APP) diff --git a/Kernel/Makefile b/Kernel/Makefile index dd753ff3a01125..e38eaa9c0d8648 100644 --- a/Kernel/Makefile +++ b/Kernel/Makefile @@ -1,3 +1,5 @@ +include ../Makefile.common + KERNEL_OBJS = \ init.o \ kmalloc.o \ @@ -77,24 +79,10 @@ CXX_OBJS = $(KERNEL_OBJS) $(VFS_OBJS) $(AK_OBJS) OBJS = $(CXX_OBJS) Boot/boot.ao KERNEL = kernel -ARCH_FLAGS = -STANDARD_FLAGS = -std=c++17 -nostdinc++ -nostdlib -nostdinc -KERNEL_FLAGS = -ffreestanding -WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough -FLAVOR_FLAGS = -mregparm=3 -fno-exceptions -fno-rtti -OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I.. -I. -CLANG_FLAGS = -Wconsumed -m32 -ffreestanding -march=i686 -#SUGGEST_FLAGS = -Wsuggest-final-types -Wsuggest-final-methods -Wsuggest-override #-Wsuggest-attribute=noreturn - -DEFINES = -DKERNEL -DSANITIZE_PTRS - -CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(KERNEL_FLAGS) $(FLAVOR_FLAGS) $(ARCH_FLAGS) $(STANDARD_FLAGS) $(SUGGEST_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) -#CXX = clang $(CLANG_FLAGS) -CXX = i686-pc-serenity-g++ +CXXFLAGS += -ffreestanding -mregparm=3 +DEFINES += -DKERNEL LD = i686-pc-serenity-ld -AS = i686-pc-serenity-as -LDFLAGS = -T linker.ld +LDFLAGS += -T linker.ld all: $(KERNEL) kernel.map diff --git a/LibC/Makefile b/LibC/Makefile index ad9c36dd104929..fbb3de53463ea5 100644 --- a/LibC/Makefile +++ b/LibC/Makefile @@ -1,3 +1,5 @@ +include ../Makefile.common + AK_OBJS = \ ../AK/StringImpl.o \ ../AK/String.o \ @@ -48,19 +50,7 @@ ASM_OBJS = setjmp.no crti.ao crtn.ao CPP_OBJS = $(AK_OBJS) $(WIDGETS_OBJS) $(LIBC_OBJS) LIBRARY = libc.a -STANDARD_FLAGS = -std=c++17 -WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough -FLAVOR_FLAGS = -fno-exceptions -fno-rtti -fno-sized-deallocation -OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I.. -I. - -DEFINES = -DUSERLAND -DSANITIZE_PTRS - -CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) -CXX = i686-pc-serenity-g++ -LD = i686-pc-serenity-ld -AR = i686-pc-serenity-ar -AS = i686-pc-serenity-as +DEFINES += -DUSERLAND all: $(LIBRARY) startfiles diff --git a/LibCore/Makefile b/LibCore/Makefile index 1d73ded45bbbe1..710a77ae65c911 100644 --- a/LibCore/Makefile +++ b/LibCore/Makefile @@ -1,3 +1,5 @@ +include ../Makefile.common + OBJS = \ CIODevice.o \ CFile.o \ @@ -17,18 +19,7 @@ OBJS = \ CEvent.o LIBRARY = libcore.a -STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation -WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough -FLAVOR_FLAGS = -fno-exceptions -fno-rtti -OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I../LibC -I../Servers -I.. -I. - -DEFINES = -DUSERLAND -DSANITIZE_PTRS -DLIBGUI - -CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) -CXX = i686-pc-serenity-g++ -LD = i686-pc-serenity-ld -AR = i686-pc-serenity-ar +DEFINES += -DUSERLAND all: $(LIBRARY) diff --git a/LibGUI/Makefile b/LibGUI/Makefile index dea0f3751b1cf3..924a5d3f601ec2 100644 --- a/LibGUI/Makefile +++ b/LibGUI/Makefile @@ -1,3 +1,5 @@ +include ../Makefile.common + SHAREDGRAPHICS_OBJS = \ ../SharedGraphics/Painter.o \ ../SharedGraphics/StylePainter.o \ @@ -55,18 +57,7 @@ LIBGUI_OBJS = \ OBJS = $(SHAREDGRAPHICS_OBJS) $(LIBGUI_OBJS) LIBRARY = libgui.a -STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation -WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough -FLAVOR_FLAGS = -fno-exceptions -fno-rtti -OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I../LibC -I../Servers -I.. -I. - -DEFINES = -DUSERLAND -DSANITIZE_PTRS -DLIBGUI - -CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) -CXX = i686-pc-serenity-g++ -LD = i686-pc-serenity-ld -AR = i686-pc-serenity-ar +DEFINES += -DUSERLAND all: $(LIBRARY) diff --git a/LibM/Makefile b/LibM/Makefile index 4257c41cbfd2d5..a6ab715693ce2a 100644 --- a/LibM/Makefile +++ b/LibM/Makefile @@ -1,18 +1,9 @@ +include ../Makefile.common + OBJS = math.o LIBRARY = libm.a -STANDARD_FLAGS = -std=c++17 -WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough -FLAVOR_FLAGS = -fno-exceptions -fno-rtti -OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I.. -I. - -DEFINES = -DUSERLAND -DSANITIZE_PTRS - -CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) -CXX = i686-pc-serenity-g++ -LD = i686-pc-serenity-ld -AR = i686-pc-serenity-ar +DEFINES += -DUSERLAND all: $(LIBRARY) diff --git a/Servers/LookupServer/Makefile b/Servers/LookupServer/Makefile index 2986a501cdec32..2833309fbc48ad 100644 --- a/Servers/LookupServer/Makefile +++ b/Servers/LookupServer/Makefile @@ -1,22 +1,12 @@ +include ../../Makefile.common + LOOKUPSERVER_OBJS = \ main.o APP = LookupServer OBJS = $(LOOKUPSERVER_OBJS) -STANDARD_FLAGS = -std=c++17 -WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough -FLAVOR_FLAGS = -fno-exceptions -fno-rtti -OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I.. -I../.. -I. -I../../LibC -LDFLAGS = -L../../LibC - -DEFINES = -DSANITIZE_PTRS -DUSERLAND - -CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) -CXX = i686-pc-serenity-g++ -LD = i686-pc-serenity-g++ -AR = i686-pc-serenity-ar +DEFINES += -DUSERLAND all: $(APP) diff --git a/Servers/WindowServer/Makefile b/Servers/WindowServer/Makefile index 6d08d3546afc00..542ff484087ad8 100644 --- a/Servers/WindowServer/Makefile +++ b/Servers/WindowServer/Makefile @@ -1,3 +1,5 @@ +include ../../Makefile.common + SHAREDGRAPHICS_OBJS = \ ../../SharedGraphics/Painter.o \ ../../SharedGraphics/StylePainter.o \ @@ -29,19 +31,7 @@ WINDOWSERVER_OBJS = \ APP = WindowServer OBJS = $(SHAREDGRAPHICS_OBJS) $(WINDOWSERVER_OBJS) -STANDARD_FLAGS = -std=c++17 -Wno-sized-deallocation -WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough -FLAVOR_FLAGS = -fno-exceptions -fno-rtti -OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I.. -I../.. -I. -I../../LibC -LDFLAGS = -L../../LibC -L../../LibCore - -DEFINES = -DSANITIZE_PTRS -DUSERLAND - -CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) -CXX = i686-pc-serenity-g++ -LD = i686-pc-serenity-g++ -AR = i686-pc-serenity-ar +DEFINES += -DUSERLAND all: $(APP) diff --git a/Userland/Makefile b/Userland/Makefile index 22c57efa088357..80c84a6af883bb 100644 --- a/Userland/Makefile +++ b/Userland/Makefile @@ -1,21 +1,10 @@ +include ../Makefile.common + SRCS = $(wildcard *.cpp) OBJS = ${SRCS:.cpp=.o} APPS = ${SRCS:.cpp=} -ARCH_FLAGS = -STANDARD_FLAGS = -std=c++17 -WARNING_FLAGS = -Wextra -Wall -Wundef -Wcast-qual -Wwrite-strings -Wimplicit-fallthrough -FLAVOR_FLAGS = -fno-exceptions -fno-rtti -fno-sized-deallocation -OPTIMIZATION_FLAGS = -Os -INCLUDE_FLAGS = -I.. -I. -I../LibC - -DEFINES = -DSANITIZE_PTRS -DUSERLAND - -CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(ARCH_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) -CXX = i686-pc-serenity-g++ -LD = i686-pc-serenity-g++ -AR = i686-pc-serenity-r -LDFLAGS = -L../LibC -L../LibCore -L../LibGUI +DEFINES += -DUSERLAND .PHONY: all list clean @@ -29,7 +18,7 @@ clean: @rm -f $(APPS) $(OBJS) *.d $(APPS) : % : %.o $(OBJS) - @echo "LD $<" + @echo "LD $@" @$(LD) -o $@ $(LDFLAGS) $< -lc -lgui -lcore %.o: %.cpp