diff options
Diffstat (limited to 'uisimulator')
-rw-r--r-- | uisimulator/common/Makefile | 5 | ||||
-rw-r--r-- | uisimulator/win32/Makefile | 8 | ||||
-rw-r--r-- | uisimulator/x11/Makefile | 5 |
3 files changed, 11 insertions, 7 deletions
diff --git a/uisimulator/common/Makefile b/uisimulator/common/Makefile index 62a124ac97..e4f3dd93c2 100644 --- a/uisimulator/common/Makefile +++ b/uisimulator/common/Makefile | |||
@@ -23,7 +23,8 @@ RM = rm -f | |||
23 | DEBUG = -g | 23 | DEBUG = -g |
24 | 24 | ||
25 | # Use this for simulator-only files | 25 | # Use this for simulator-only files |
26 | INCLUDES = -I. -I$(OBJDIR) -I$(FIRMDIR)/export -I$(APPSDIR) -I$(ROOTDIR)/uisimulator/$(SIMVER) | 26 | INCLUDES = -I. -I$(OBJDIR) -I$(FIRMDIR)/export -I$(APPSDIR) \ |
27 | -I$(ROOTDIR)/uisimulator/$(SIMVER) -I$(BUILDDIR) | ||
27 | 28 | ||
28 | # This sets up 'SRC' based on the files mentioned in SOURCES | 29 | # This sets up 'SRC' based on the files mentioned in SOURCES |
29 | include $(TOOLSDIR)/makesrc.inc | 30 | include $(TOOLSDIR)/makesrc.inc |
@@ -39,7 +40,7 @@ DIRS = . | |||
39 | 40 | ||
40 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) $(GCCOPTS) | 41 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) $(GCCOPTS) |
41 | 42 | ||
42 | OUTFILE = $(OBJDIR)/libcomsim.a | 43 | OUTFILE = $(BUILDDIR)/libcomsim.a |
43 | 44 | ||
44 | all: $(OUTFILE) | 45 | all: $(OUTFILE) |
45 | 46 | ||
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile index f04a54bdd4..1921e54ca3 100644 --- a/uisimulator/win32/Makefile +++ b/uisimulator/win32/Makefile | |||
@@ -24,7 +24,8 @@ DEPFILE = $(OBJDIR)/dep-simwin | |||
24 | RM = rm -f | 24 | RM = rm -f |
25 | DEBUG = -g | 25 | DEBUG = -g |
26 | 26 | ||
27 | INCLUDES = -I. -I$(SIMCOMMON) -I$(OBJDIR) -I$(FIRMDIR)/export -I$(APPSDIR) | 27 | INCLUDES = -I. -I$(SIMCOMMON) -I$(OBJDIR) -I$(FIRMDIR)/export -I$(APPSDIR) \ |
28 | -I$(BUILDDIR) | ||
28 | 29 | ||
29 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ | 30 | DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ |
30 | $(TARGET) -DAPPSVERSION=\"$(VERSION)\" -DMEM=${MEMORYSIZE} $(EXTRA_DEFINES) | 31 | $(TARGET) -DAPPSVERSION=\"$(VERSION)\" -DMEM=${MEMORYSIZE} $(EXTRA_DEFINES) |
@@ -39,7 +40,7 @@ DIRS = . | |||
39 | 40 | ||
40 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall -mno-cygwin | 41 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall -mno-cygwin |
41 | 42 | ||
42 | OUTFILE = $(OBJDIR)/libsim.a | 43 | OUTFILE = $(BUILDDIR)/libsim.a |
43 | 44 | ||
44 | all: $(OUTFILE) | 45 | all: $(OUTFILE) |
45 | @echo "MAKE in common sim" | 46 | @echo "MAKE in common sim" |
@@ -62,7 +63,8 @@ $(OBJDIR)/UI256.bmp: UI-$(ARCHOS).bmp | |||
62 | @cp $< $@ | 63 | @cp $< $@ |
63 | 64 | ||
64 | $(OBJDIR)/uisw32-res.o: uisw32.rc $(OBJDIR)/UI256.bmp | 65 | $(OBJDIR)/uisw32-res.o: uisw32.rc $(OBJDIR)/UI256.bmp |
65 | $(WINDRES) --include-dir $(OBJDIR) -i $< -o $@ | 66 | @echo "WINDRES" |
67 | @$(WINDRES) --include-dir $(OBJDIR) -i $< -o $@ | ||
66 | 68 | ||
67 | include $(TOOLSDIR)/make.inc | 69 | include $(TOOLSDIR)/make.inc |
68 | 70 | ||
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index f032c664be..4d3e1e7fce 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile | |||
@@ -25,7 +25,8 @@ RM = rm -f | |||
25 | DEBUG = -g | 25 | DEBUG = -g |
26 | 26 | ||
27 | # Use this for simulator-only files | 27 | # Use this for simulator-only files |
28 | INCLUDES = -I. -I$(SIMCOMMON) -I$(OBJDIR) -I$(FIRMDIR)/export -I$(APPSDIR) | 28 | INCLUDES = -I. -I$(SIMCOMMON) -I$(OBJDIR) -I$(FIRMDIR)/export -I$(APPSDIR) \ |
29 | -I$(BUILDDIR) | ||
29 | 30 | ||
30 | # This sets up 'SRC' based on the files mentioned in SOURCES | 31 | # This sets up 'SRC' based on the files mentioned in SOURCES |
31 | include $(TOOLSDIR)/makesrc.inc | 32 | include $(TOOLSDIR)/makesrc.inc |
@@ -41,7 +42,7 @@ DIRS = . | |||
41 | 42 | ||
42 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) $(GCCOPTS) | 43 | CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) $(GCCOPTS) |
43 | 44 | ||
44 | OUTFILE = $(OBJDIR)/libsim.a | 45 | OUTFILE = $(BUILDDIR)/libsim.a |
45 | 46 | ||
46 | all: $(OUTFILE) | 47 | all: $(OUTFILE) |
47 | @$(MAKE) -C $(SIMCOMMON) | 48 | @$(MAKE) -C $(SIMCOMMON) |