devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Henrik Backe's fixes to enable this to build using cygwin.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@3384 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Daniel Stenberg 2003-03-05 22:45:14 +00:00
parent 31993d803e
commit a5bfaa9e98
1 changed files with 15 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

18
uisimulator/x11/Makefile
View file

@ -49,8 +49,6 @@ LANGUAGE = english
DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \
$(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES) $(RTC) $(KEYPAD) $(DISPLAY) $(EXTRA_DEFINES) $(RTC)
LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl
# Use this for simulator-only files # Use this for simulator-only files
INCLUDES = -I. -I$(DRIVERS) -I$(FIRMWAREDIR)/export -I$(APPDIR) \ INCLUDES = -I. -I$(DRIVERS) -I$(FIRMWAREDIR)/export -I$(APPDIR) \
-I$(MACHINEDIR) -I../common -I$(OBJDIR) -I$(MACHINEDIR) -I../common -I$(OBJDIR)
@ -61,16 +59,25 @@ APPINCLUDES = $(INCLUDES)
LIBS = -lpthread LIBS = -lpthread
UNAME := $(shell uname) UNAME := $(shell uname|sed -e "s/CYGWIN.*/CYGWIN/")
ifeq ($(UNAME),Linux) ifeq ($(UNAME),Linux)
LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl
INCLUDES += -I/usr/X11R6/include INCLUDES += -I/usr/X11R6/include
LIBDIRS = -L/usr/X11R6/lib LIBDIRS = -L/usr/X11R6/lib
DEFINES += -DLINUX DEFINES += -DLINUX
#MPEG_PLAY = 1 #MPEG_PLAY = 1
else 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 DEFINES += -DBIG_ENDIAN
LIBDIRS = LIBDIRS =
endif endif
endif
ifdef MPEG_PLAY ifdef MPEG_PLAY
INCLUDES += -I$(PREVAPPDIR)/common INCLUDES += -I$(PREVAPPDIR)/common
@ -321,8 +328,13 @@ $(OBJDIR)/lcd-player.o: $(DRIVERS)/lcd-player.c
$(OBJDIR)/%.o: %.c $(OBJDIR)/%.o: %.c
$(CC) $(CFLAGS) -c $< -o $@ $(CC) $(CFLAGS) -c $< -o $@
ifeq ($(UNAME),CYGWIN)
$(TARGET): $(OBJS)
$(CC) -g -o $(TARGET) $(OBJS) $(LIBDIRS) $(LDFLAGS) $(LIBS)
else
$(TARGET): $(OBJS) $(TARGET): $(OBJS)
$(CC) -g -o $(TARGET) $(LIBDIRS) $(LDFLAGS) $(OBJS) $(LIBS) $(CC) -g -o $(TARGET) $(LIBDIRS) $(LDFLAGS) $(OBJS) $(LIBS)
endif
DEPS:=$(OBJDIR)/.deps DEPS:=$(OBJDIR)/.deps