RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 00:47:45 +00:00
Code Issues Activity Actions

Userland: Oops, that merge broke the build, just needed a few tweaks. :^)

Browse source
This commit is contained in:
Andreas Kling 2019-04-14 20:32:44 +02:00
parent 16ef7517c4
commit adc91d92a3
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Makefile
View file

@ -12,7 +12,7 @@ INCLUDE_FLAGS = -I.. -I. -I../LibC
DEFINES = -DSERENITY -DSANITIZE_PTRS -DUSERLAND DEFINES = -DSERENITY -DSANITIZE_PTRS -DUSERLAND
CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(ARCH_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES) CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(ARCH_FLAGS) $(STANDARD_FLAGS) $(INCLUDE_FLAGS) $(DEFINES)
CXX = i686-pca-serenity-g++ CXX = i686-pc-serenity-g++
LD = i686-pc-serenity-g++ LD = i686-pc-serenity-g++
AR = i686-pc-serenity-r AR = i686-pc-serenity-r
LDFLAGS = -L../LibC -L../LibCore -L../LibGUI LDFLAGS = -L../LibC -L../LibCore -L../LibGUI
@ -30,7 +30,7 @@ clean:
$(APPS) : % : %.o $(OBJS) $(APPS) : % : %.o $(OBJS)
@echo "LD $<" @echo "LD $<"
@$(LD) -o $@ $(LDFLAGS) $< -lc @$(LD) -o $@ $(LDFLAGS) $< -lc -lgui -lcore
%.o: %.cpp %.o: %.cpp
@echo "CXX $<" @echo "CXX $<"