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 @@ APPDIR = ../../apps RECDIR = $(APPDIR)/recorder PLAYDIR = $(APPDIR)/player +PLUGINDIR = $(APPDIR)/plugins ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP) MACHINEDIR = $(RECDIR) @@ -126,6 +127,9 @@ all: $(TOOLSDIR)/convbdf $(TARGET) $(EXTRA_TARGETS) $(ROCKS) $(TOOLSDIR)/convbdf: $(MAKE) -C $(TOOLSDIR) +$(OBJDIR)/libplugin.a: + $(MAKE) -C $(PLUGINDIR)/lib DEBUG=$(DEBUG) OBJDIR=$(OBJDIR) VERSION=$(VERSION) EXTRA_DEFINES="$(EXTRA_DEFINES)" SIMULATOR=1 + clean: $(RM) $(OBJS) *~ core $(TARGET) $(CLIENTS) $(OBJDIR)/lang.[cho] \ $(OBJDIR)/build.lang $(OBJDIR)/*.o $(OBJDIR)/sysfont.c \ @@ -133,7 +137,7 @@ clean: $(RM) -r $(DEPS) $(OBJDIR)/%.rock: $(APPDIR)/plugins/%.c $(APPDIR)/plugin.h - $(CC) $(APPCFLAGS) -DPLUGIN -shared $< -o $@ + $(CC) $(APPCFLAGS) -DPLUGIN -L$(OBJDIR) -lplugin -shared $< -o $@ distclean: clean $(RM) config.cache @@ -314,10 +318,10 @@ $(OBJDIR)/%.o: %.c $(CC) $(CFLAGS) -c $< -o $@ ifeq ($(UNAME),CYGWIN) -$(TARGET): $(OBJS) +$(TARGET): $(OBJS) $(OBJDIR)/libplugin.a $(CC) -g -o $(TARGET) $(OBJS) $(LIBDIRS) $(LDFLAGS) $(LIBS) else -$(TARGET): $(OBJS) +$(TARGET): $(OBJS) $(OBJDIR)/libplugin.a $(CC) -g -o $(TARGET) $(LIBDIRS) $(LDFLAGS) $(OBJS) $(LIBS) endif |