diff options
author | Daniel Stenberg <daniel@haxx.se> | 2004-06-20 22:00:21 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2004-06-20 22:00:21 +0000 |
commit | 4df35e5f78a21f2990ec4c31fc38db0d2bea2695 (patch) | |
tree | e900f3ced0dd109d0953c4c8be6b7e5ec7305578 | |
parent | 74eb64257ace75c290e7eb504774a39764529d1d (diff) | |
download | rockbox-4df35e5f78a21f2990ec4c31fc38db0d2bea2695.tar.gz rockbox-4df35e5f78a21f2990ec4c31fc38db0d2bea2695.zip |
provide libplugin support
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@4779 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r-- | uisimulator/x11/Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index 03b23acef3..c095885baa 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile | |||
@@ -20,6 +20,7 @@ | |||
20 | APPDIR = ../../apps | 20 | APPDIR = ../../apps |
21 | RECDIR = $(APPDIR)/recorder | 21 | RECDIR = $(APPDIR)/recorder |
22 | PLAYDIR = $(APPDIR)/player | 22 | PLAYDIR = $(APPDIR)/player |
23 | PLUGINDIR = $(APPDIR)/plugins | ||
23 | 24 | ||
24 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) | 25 | ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) |
25 | MACHINEDIR = $(RECDIR) | 26 | MACHINEDIR = $(RECDIR) |
@@ -126,6 +127,9 @@ all: $(TOOLSDIR)/convbdf $(TARGET) $(EXTRA_TARGETS) $(ROCKS) | |||
126 | $(TOOLSDIR)/convbdf: | 127 | $(TOOLSDIR)/convbdf: |
127 | $(MAKE) -C $(TOOLSDIR) | 128 | $(MAKE) -C $(TOOLSDIR) |
128 | 129 | ||
130 | $(OBJDIR)/libplugin.a: | ||
131 | $(MAKE) -C $(PLUGINDIR)/lib DEBUG=$(DEBUG) OBJDIR=$(OBJDIR) VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" SIMULATOR=1 | ||
132 | |||
129 | clean: | 133 | clean: |
130 | $(RM) $(OBJS) *~ core $(TARGET) $(CLIENTS) $(OBJDIR)/lang.[cho] \ | 134 | $(RM) $(OBJS) *~ core $(TARGET) $(CLIENTS) $(OBJDIR)/lang.[cho] \ |
131 | $(OBJDIR)/build.lang $(OBJDIR)/*.o $(OBJDIR)/sysfont.c \ | 135 | $(OBJDIR)/build.lang $(OBJDIR)/*.o $(OBJDIR)/sysfont.c \ |
@@ -133,7 +137,7 @@ clean: | |||
133 | $(RM) -r $(DEPS) | 137 | $(RM) -r $(DEPS) |
134 | 138 | ||
135 | $(OBJDIR)/%.rock: $(APPDIR)/plugins/%.c $(APPDIR)/plugin.h | 139 | $(OBJDIR)/%.rock: $(APPDIR)/plugins/%.c $(APPDIR)/plugin.h |
136 | $(CC) $(APPCFLAGS) -DPLUGIN -shared $< -o $@ | 140 | $(CC) $(APPCFLAGS) -DPLUGIN -L$(OBJDIR) -lplugin -shared $< -o $@ |
137 | 141 | ||
138 | distclean: clean | 142 | distclean: clean |
139 | $(RM) config.cache | 143 | $(RM) config.cache |
@@ -314,10 +318,10 @@ $(OBJDIR)/%.o: %.c | |||
314 | $(CC) $(CFLAGS) -c $< -o $@ | 318 | $(CC) $(CFLAGS) -c $< -o $@ |
315 | 319 | ||
316 | ifeq ($(UNAME),CYGWIN) | 320 | ifeq ($(UNAME),CYGWIN) |
317 | $(TARGET): $(OBJS) | 321 | $(TARGET): $(OBJS) $(OBJDIR)/libplugin.a |
318 | $(CC) -g -o $(TARGET) $(OBJS) $(LIBDIRS) $(LDFLAGS) $(LIBS) | 322 | $(CC) -g -o $(TARGET) $(OBJS) $(LIBDIRS) $(LDFLAGS) $(LIBS) |
319 | else | 323 | else |
320 | $(TARGET): $(OBJS) | 324 | $(TARGET): $(OBJS) $(OBJDIR)/libplugin.a |
321 | $(CC) -g -o $(TARGET) $(LIBDIRS) $(LDFLAGS) $(OBJS) $(LIBS) | 325 | $(CC) -g -o $(TARGET) $(LIBDIRS) $(LDFLAGS) $(OBJS) $(LIBS) |
322 | endif | 326 | endif |
323 | 327 | ||