diff options
| author | Andreas Kling <awesomekling@gmail.com> | 2019-04-10 16:14:44 +0200 |
|---|---|---|
| committer | Andreas Kling <awesomekling@gmail.com> | 2019-04-10 16:14:44 +0200 |
| commit | 5e0577a04223e265a7f93d46598ff1c0070ce6bb (patch) | |
| tree | bb89ce18b4777aa11024dae901d292aaf3fb5209 /Userland | |
| parent | a74f3615ac810384841c94de82d0569d7e85be25 (diff) | |
| download | serenity-5e0577a04223e265a7f93d46598ff1c0070ce6bb.zip | |
Introduce LibCore and move GElapsedTimer => CElapsedTimer.
I need a layer somewhere between AK (usable both by userspace and kernel)
and LibGUI (usable by userspace except WindowServer.) So here's LibCore.
Diffstat (limited to 'Userland')
| -rw-r--r-- | Userland/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Userland/Makefile b/Userland/Makefile index 66707b88a0..3235ec5f82 100644 --- a/Userland/Makefile +++ b/Userland/Makefile @@ -98,7 +98,7 @@ CXXFLAGS = -MMD -MP $(WARNING_FLAGS) $(OPTIMIZATION_FLAGS) $(FLAVOR_FLAGS) $(ARC CXX = i686-pc-serenity-g++ LD = i686-pc-serenity-g++ AR = i686-pc-serenity-r -LDFLAGS = -L ../LibC +LDFLAGS = -L../LibC -L../LibCore -L../LibGUI all: $(OBJS) $(APPS) @@ -169,13 +169,13 @@ more: more.o $(LD) -o $@ $(LDFLAGS) $< -lc guitest2: guitest2.o - $(LD) -o $@ $(LDFLAGS) -L../LibGUI $< -lgui -lc + $(LD) -o $@ $(LDFLAGS) $< -lgui -lcore -lc sysctl: sysctl.o $(LD) -o $@ $(LDFLAGS) $< -lc pape: pape.o - $(LD) -o $@ $(LDFLAGS) -L../LibGUI $< -lgui -lc + $(LD) -o $@ $(LDFLAGS) $< -lgui -lcore -lc cp: cp.o $(LD) -o $@ $(LDFLAGS) $< -lc @@ -223,10 +223,10 @@ host: host.o $(LD) -o $@ $(LDFLAGS) $< -lc qs: qs.o - $(LD) -o $@ $(LDFLAGS) -L../LibGUI $< -lgui -lc + $(LD) -o $@ $(LDFLAGS) $< -lgui -lcore -lc mv: mv.o - $(LD) -o $@ $(LDFLAGS) -L../LibGUI $< -lgui -lc + $(LD) -o $@ $(LDFLAGS) $< -lc .cpp.o: @echo "CXX $<"; $(CXX) $(CXXFLAGS) -o $@ -c $< |