diff options
Diffstat (limited to 'uisimulator/x11')
-rw-r--r-- | uisimulator/x11/Makefile | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index 392e4c3595..0715ac7c70 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile | |||
@@ -49,8 +49,6 @@ LANGUAGE = english | |||
49 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ | 49 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ |
50 | $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES) $(RTC) | 50 | $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES) $(RTC) |
51 | 51 | ||
52 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl | ||
53 | |||
54 | # Use this for simulator-only files | 52 | # Use this for simulator-only files |
55 | INCLUDES = -I. -I$(DRIVERS) -I$(FIRMWAREDIR)/export -I$(APPDIR) \ | 53 | INCLUDES = -I. -I$(DRIVERS) -I$(FIRMWAREDIR)/export -I$(APPDIR) \ |
56 | -I$(MACHINEDIR) -I../common -I$(OBJDIR) | 54 | -I$(MACHINEDIR) -I../common -I$(OBJDIR) |
@@ -61,16 +59,25 @@ APPINCLUDES = $(INCLUDES) | |||
61 | 59 | ||
62 | LIBS = -lpthread | 60 | LIBS = -lpthread |
63 | 61 | ||
64 | UNAME := $(shell uname) | 62 | UNAME := $(shell uname|sed -e "s/CYGWIN.*/CYGWIN/") |
65 | ifeq ($(UNAME),Linux) | 63 | ifeq ($(UNAME),Linux) |
64 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl | ||
66 | INCLUDES += -I/usr/X11R6/include | 65 | INCLUDES += -I/usr/X11R6/include |
67 | LIBDIRS = -L/usr/X11R6/lib | 66 | LIBDIRS = -L/usr/X11R6/lib |
68 | DEFINES += -DLINUX | 67 | DEFINES += -DLINUX |
69 | #MPEG_PLAY = 1 | 68 | #MPEG_PLAY = 1 |
70 | else | 69 | else |
70 | ifeq ($(UNAME),CYGWIN) | ||
71 | LDFLAGS = -lSM -lICE -lXt -lX11 -lXmu -lSM -lICE -lX11 | ||
72 | INCLUDES += -I/usr/X11R6/include | ||
73 | LIBDIRS = -L/usr/X11R6/lib | ||
74 | DEFINES += -DLINUX | ||
75 | else | ||
76 | LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl | ||
71 | DEFINES += -DBIG_ENDIAN | 77 | DEFINES += -DBIG_ENDIAN |
72 | LIBDIRS = | 78 | LIBDIRS = |
73 | endif | 79 | endif |
80 | endif | ||
74 | 81 | ||
75 | ifdef MPEG_PLAY | 82 | ifdef MPEG_PLAY |
76 | INCLUDES += -I$(PREVAPPDIR)/common | 83 | INCLUDES += -I$(PREVAPPDIR)/common |
@@ -321,8 +328,13 @@ $(OBJDIR)/lcd-player.o: $(DRIVERS)/lcd-player.c | |||
321 | $(OBJDIR)/%.o: %.c | 328 | $(OBJDIR)/%.o: %.c |
322 | $(CC) $(CFLAGS) -c $< -o $@ | 329 | $(CC) $(CFLAGS) -c $< -o $@ |
323 | 330 | ||
331 | ifeq ($(UNAME),CYGWIN) | ||
332 | $(TARGET): $(OBJS) | ||
333 | $(CC) -g -o $(TARGET) $(OBJS) $(LIBDIRS) $(LDFLAGS) $(LIBS) | ||
334 | else | ||
324 | $(TARGET): $(OBJS) | 335 | $(TARGET): $(OBJS) |
325 | $(CC) -g -o $(TARGET) $(LIBDIRS) $(LDFLAGS) $(OBJS) $(LIBS) | 336 | $(CC) -g -o $(TARGET) $(LIBDIRS) $(LDFLAGS) $(OBJS) $(LIBS) |
337 | endif | ||
326 | 338 | ||
327 | DEPS:=$(OBJDIR)/.deps | 339 | DEPS:=$(OBJDIR)/.deps |
328 | 340 | ||