diff options
| author | Björn Stenberg <bjorn@haxx.se> | 2004-09-19 21:58:37 +0000 |
|---|---|---|
| committer | Björn Stenberg <bjorn@haxx.se> | 2004-09-19 21:58:37 +0000 |
| commit | 6c33c51a4ca9907d23e3154d956fd6781122f492 (patch) | |
| tree | f0e598efaf064bb72c33c0a8a2edba4cf9ebb13c /uisimulator/x11/Makefile | |
| parent | 17f54a40f100a3343a15a431d235699024aa76c8 (diff) | |
Redesigned the button handling. The code now uses symbolic function defines instead of checking for specific buttons. This makes it easier to add support for new devices with different button layouts.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@5091 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator/x11/Makefile')
| -rw-r--r-- | uisimulator/x11/Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index 785e590623..2bc2cba267 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile @@ -23,6 +23,7 @@ PLAYDIR = $(APPDIR)/player PLUGINDIR = $(APPDIR)/plugins SIMCOMMON = ../common +ISONDIO := $(findstring ONDIO, $(TARGET)) ISPLAYER := $(findstring PLAYER, $(TARGET)) ifeq ($(ISPLAYER), PLAYER) MACHINEDIR = $(PLAYDIR) @@ -142,8 +143,10 @@ SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c \ OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o) +ifneq ($(ISONDIO),ONDIO) ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c)) PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c)) +endif all: $(TOOLSDIR)/convbdf $(EXEFILE) $(ROCKS) @@ -249,11 +252,11 @@ $(OBJDIR)/%.o: %.c $(CC) $(CFLAGS) -c $< -o $@ ifeq ($(UNAME),CYGWIN) -$(EXEFILE): $(OBJS) $(OBJDIR)/libplugin.a +$(EXEFILE): $(OBJS) @echo LD $@ @$(CC) -g -o $(EXEFILE) $(OBJS) $(LIBDIRS) $(LDFLAGS) $(LIBS) else -$(EXEFILE): $(OBJS) $(OBJDIR)/libplugin.a +$(EXEFILE): $(OBJS) @echo LD $@ @$(CC) -g -o $(EXEFILE) $(LIBDIRS) $(LDFLAGS) $(OBJS) $(LIBS) endif |