diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2003-03-05 22:45:14 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2003-03-05 22:45:14 +0000 |
| commit | a5bfaa9e98306f8a869d2eff9bc3af3f292bae36 (patch) | |
| tree | de69727170763501f6cfcfb8fd78f82467278327 /uisimulator | |
| parent | 31993d803e08a892cdfdc02d6dd9dbc45dc0734a (diff) | |
Henrik Backe's fixes to enable this to build using cygwin.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3384 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator')
| -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 DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES) $(RTC) -LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl - # Use this for simulator-only files INCLUDES = -I. -I$(DRIVERS) -I$(FIRMWAREDIR)/export -I$(APPDIR) \ -I$(MACHINEDIR) -I../common -I$(OBJDIR) @@ -61,16 +59,25 @@ APPINCLUDES = $(INCLUDES) LIBS = -lpthread -UNAME := $(shell uname) +UNAME := $(shell uname|sed -e "s/CYGWIN.*/CYGWIN/") ifeq ($(UNAME),Linux) + LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl INCLUDES += -I/usr/X11R6/include LIBDIRS = -L/usr/X11R6/lib DEFINES += -DLINUX #MPEG_PLAY = 1 else +ifeq ($(UNAME),CYGWIN) + LDFLAGS = -lSM -lICE -lXt -lX11 -lXmu -lSM -lICE -lX11 + INCLUDES += -I/usr/X11R6/include + LIBDIRS = -L/usr/X11R6/lib + DEFINES += -DLINUX +else + LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl DEFINES += -DBIG_ENDIAN LIBDIRS = endif +endif ifdef MPEG_PLAY INCLUDES += -I$(PREVAPPDIR)/common @@ -321,8 +328,13 @@ $(OBJDIR)/lcd-player.o: $(DRIVERS)/lcd-player.c $(OBJDIR)/%.o: %.c $(CC) $(CFLAGS) -c $< -o $@ +ifeq ($(UNAME),CYGWIN) +$(TARGET): $(OBJS) + $(CC) -g -o $(TARGET) $(OBJS) $(LIBDIRS) $(LDFLAGS) $(LIBS) +else $(TARGET): $(OBJS) $(CC) -g -o $(TARGET) $(LIBDIRS) $(LDFLAGS) $(OBJS) $(LIBS) +endif DEPS:=$(OBJDIR)/.deps |