summaryrefslogtreecommitdiff
path: root/uisimulator/x11/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'uisimulator/x11/Makefile')
-rw-r--r--uisimulator/x11/Makefile7
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
23PLUGINDIR = $(APPDIR)/plugins 23PLUGINDIR = $(APPDIR)/plugins
24SIMCOMMON = ../common 24SIMCOMMON = ../common
25 25
26ISONDIO := $(findstring ONDIO, $(TARGET))
26ISPLAYER := $(findstring PLAYER, $(TARGET)) 27ISPLAYER := $(findstring PLAYER, $(TARGET))
27ifeq ($(ISPLAYER), PLAYER) 28ifeq ($(ISPLAYER), PLAYER)
28 MACHINEDIR = $(PLAYDIR) 29 MACHINEDIR = $(PLAYDIR)
@@ -142,8 +143,10 @@ SRCS = screenhack.c uibasic.c resources.c visual.c lcd-x11.c \
142 143
143OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o) 144OBJS := $(OBJDIR)/lang.o $(SRCS:%.c=$(OBJDIR)/%.o)
144 145
146ifneq ($(ISONDIO),ONDIO)
145ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c)) 147ROCKS := $(patsubst $(PLUGINDIR)/%.c,$(OBJDIR)/%.rock,$(wildcard $(PLUGINDIR)/*.c))
146PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c)) 148PLUGINLIBOBJS := $(patsubst $(PLUGINDIR)/lib/%.c,$(OBJDIR)/%.o,$(wildcard $(PLUGINDIR)/lib/*.c))
149endif
147 150
148all: $(TOOLSDIR)/convbdf $(EXEFILE) $(ROCKS) 151all: $(TOOLSDIR)/convbdf $(EXEFILE) $(ROCKS)
149 152
@@ -249,11 +252,11 @@ $(OBJDIR)/%.o: %.c
249 $(CC) $(CFLAGS) -c $< -o $@ 252 $(CC) $(CFLAGS) -c $< -o $@
250 253
251ifeq ($(UNAME),CYGWIN) 254ifeq ($(UNAME),CYGWIN)
252$(EXEFILE): $(OBJS) $(OBJDIR)/libplugin.a 255$(EXEFILE): $(OBJS)
253 @echo LD $@ 256 @echo LD $@
254 @$(CC) -g -o $(EXEFILE) $(OBJS) $(LIBDIRS) $(LDFLAGS) $(LIBS) 257 @$(CC) -g -o $(EXEFILE) $(OBJS) $(LIBDIRS) $(LDFLAGS) $(LIBS)
255else 258else
256$(EXEFILE): $(OBJS) $(OBJDIR)/libplugin.a 259$(EXEFILE): $(OBJS)
257 @echo LD $@ 260 @echo LD $@
258 @$(CC) -g -o $(EXEFILE) $(LIBDIRS) $(LDFLAGS) $(OBJS) $(LIBS) 261 @$(CC) -g -o $(EXEFILE) $(LIBDIRS) $(LDFLAGS) $(OBJS) $(LIBS)
259endif 262endif