diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2005-02-22 12:19:12 +0000 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2005-02-22 12:19:12 +0000 |
| commit | 22b7701fe75cce9afdbc27046821dc089f9e7dac (patch) | |
| tree | ca5b4f0428fad0fc9c775dfb0ac879ddee863846 /uisimulator/win32 | |
| parent | 376057d2b67bae0a7b24ae1715d3cbb0b540b7a9 (diff) | |
| download | rockbox-22b7701fe75cce9afdbc27046821dc089f9e7dac.tar.gz rockbox-22b7701fe75cce9afdbc27046821dc089f9e7dac.zip | |
Build cleanup and general fixes. fprintf() is now fdprintf(), the separation
between uisimulator files and firmware/apps files are better done.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6031 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'uisimulator/win32')
| -rw-r--r-- | uisimulator/win32/Makefile | 15 | ||||
| -rw-r--r-- | uisimulator/win32/SOURCES | 2 | ||||
| -rw-r--r-- | uisimulator/win32/dir-win32.h | 1 |
3 files changed, 7 insertions, 11 deletions
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile index 4878d85bf1..f429cad8b5 100644 --- a/uisimulator/win32/Makefile +++ b/uisimulator/win32/Makefile @@ -29,8 +29,6 @@ INCLUDES = -I. -I$(SIMCOMMON) -I$(OBJDIR) -I$(FIRMDIR)/export -I$(APPSDIR) DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ $(TARGET) -DAPPSVERSION=\"$(VERSION)\" -DMEM=${MEMORYSIZE} $(EXTRA_DEFINES) -LDFLAGS = -lgdi32 -luser32 - SRC := $(shell cat SOURCES | gcc -DMEMORYSIZE=$(MEMORYSIZE) $(INCLUDES) \ $(TARGET) $(DEFINES) $(EXTRA_DEFINES) -E -P -include "config.h" - ) OBJS := $(SRC:%.c=$(OBJDIR)/%.o) @@ -40,20 +38,15 @@ DIRS = . CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall -mno-cygwin -DLLTOOLFLAGS = --export-all -DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin - OUTFILE = $(OBJDIR)/libsim.a all: $(OUTFILE) @echo "MAKE in common sim" $(MAKE) -C $(SIMCOMMON) -include $(TOOLSDIR)/make.inc - -$(OUTFILE): $(OBJS) +$(OUTFILE): $(OBJS) $(OBJDIR)/UI256.bmp $(OBJDIR)/uisw32-res.o @echo "AR+RANLIB $@" - @$(AR) ruv $@ $(OBJS) >/dev/null 2>&1 + @$(AR) ruv $@ $(OBJS) $(OBJDIR)/uisw32-res.o >/dev/null 2>&1 @$(RANLIB) $@ clean: @@ -68,6 +61,8 @@ $(OBJDIR)/UI256.bmp: UI-$(ARCHOS).bmp @cp $< $@ $(OBJDIR)/uisw32-res.o: uisw32.rc $(OBJDIR)/UI256.bmp - $(WINDRES) -I$(OBJDIR) -i $< -o $@ + $(WINDRES) --include-dir $(OBJDIR) -i $< -o $@ + +include $(TOOLSDIR)/make.inc -include $(DEPFILE) diff --git a/uisimulator/win32/SOURCES b/uisimulator/win32/SOURCES index 6a52c5ed5e..a88115ade6 100644 --- a/uisimulator/win32/SOURCES +++ b/uisimulator/win32/SOURCES @@ -1,6 +1,8 @@ button.c debug-win32.c +#if 0 /* this is only for non-cygwin simulator builds */ dir-win32.c +#endif kernel.c lcd-win32.c mpeg-win32.c diff --git a/uisimulator/win32/dir-win32.h b/uisimulator/win32/dir-win32.h index 888a83767a..95ce326e9f 100644 --- a/uisimulator/win32/dir-win32.h +++ b/uisimulator/win32/dir-win32.h @@ -20,7 +20,6 @@ #define _DIR_WIN32_H_ #include <stdbool.h> -#include "file.h" struct dirent { unsigned char d_name[MAX_PATH]; |