summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/Makefile2
-rw-r--r--apps/codecs/Makefile8
-rw-r--r--apps/plugins/Makefile6
3 files changed, 8 insertions, 8 deletions
diff --git a/apps/Makefile b/apps/Makefile
index 6b3f999112..26f96a5b79 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -164,7 +164,7 @@ endif
164 164
165 165
166$(BUILDDIR)/$(BINARY) : $(OBJS) $(DEPFILE) $(BUILDDIR)/libsim.a \ 166$(BUILDDIR)/$(BINARY) : $(OBJS) $(DEPFILE) $(BUILDDIR)/libsim.a \
167 $(BUILDDIR)/libcomsim.a $(LIBROCKBOX) 167 $(BUILDDIR)/libcomsim.a $(LIBROCKBOX) $(BITMAPLIBS)
168 @echo "LD $(BINARY)" 168 @echo "LD $(BINARY)"
169 $(SILENT)$(CC) $(GCCOPTS) -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lsim -lcomsim $(LINKBITMAPS) $(LDOPTS) $(EXTRAOBJ) -Wl,-Map,$(OBJDIR)/rockbox.map 169 $(SILENT)$(CC) $(GCCOPTS) -o $@ $(OBJS) -L$(BUILDDIR) -lrockbox -lsim -lcomsim $(LINKBITMAPS) $(LDOPTS) $(EXTRAOBJ) -Wl,-Map,$(OBJDIR)/rockbox.map
170 170
diff --git a/apps/codecs/Makefile b/apps/codecs/Makefile
index c93b59b8f4..a6e25d82b3 100644
--- a/apps/codecs/Makefile
+++ b/apps/codecs/Makefile
@@ -76,7 +76,7 @@ ifeq ($(SIMVER), x11)
76################################################### 76###################################################
77# This is the X11 simulator version 77# This is the X11 simulator version
78 78
79$(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a 79$(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT)
80 @echo "LD $(notdir $@)" 80 @echo "LD $(notdir $@)"
81 $(SILENT)$(CC) $(CFLAGS) -shared $^ -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ 81 $(SILENT)$(CC) $(CFLAGS) -shared $^ -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@
82ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) 82ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
@@ -92,8 +92,8 @@ ifeq ($(SIMVER), sdl)
92################################################### 92###################################################
93# This is the SDL simulator version 93# This is the SDL simulator version
94 94
95$(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a 95$(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT)
96 @echo "LD "`basename $@` 96 @echo "LD $(notdir $@)"
97 $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@ 97 $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lcodec -o $@
98ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) 98ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
99# 'x' must be kept or you'll have "Win32 error 5" 99# 'x' must be kept or you'll have "Win32 error 5"
@@ -109,7 +109,7 @@ else # end of sdl-simulator
109DLLTOOLFLAGS = --export-all 109DLLTOOLFLAGS = --export-all
110DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin 110DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
111 111
112$(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a 112$(OBJDIR)/%.codec : $(OBJDIR)/%.o $(BUILDDIR)/libcodec.a $(OUTPUT)
113 @echo "DLL $(notdir $@)" 113 @echo "DLL $(notdir $@)"
114 $(SILENT)$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< 114 $(SILENT)$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $<
115 $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libcodec.a \ 115 $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libcodec.a \
diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile
index 67265a3ca4..f7bd102a5b 100644
--- a/apps/plugins/Makefile
+++ b/apps/plugins/Makefile
@@ -100,7 +100,7 @@ ifeq ($(SIMVER), x11)
100################################################### 100###################################################
101# This is the X11 simulator version 101# This is the X11 simulator version
102 102
103$(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a 103$(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a $(BITMAPLIBS)
104 @echo "LD "`basename $@` 104 @echo "LD "`basename $@`
105 $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -o $@ 105 $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -o $@
106ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) 106ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
@@ -116,7 +116,7 @@ ifeq ($(SIMVER), sdl)
116################################################### 116###################################################
117# This is the SDL simulator version 117# This is the SDL simulator version
118 118
119$(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a 119$(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a $(BITMAPLIBS)
120 @echo "LD "`basename $@` 120 @echo "LD "`basename $@`
121 $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -o $@ 121 $(SILENT)$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lplugin $(LINKBITMAPS) -o $@
122ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) 122ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
@@ -133,7 +133,7 @@ else # end of sdl-simulator
133DLLTOOLFLAGS = --export-all 133DLLTOOLFLAGS = --export-all
134DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin 134DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
135 135
136$(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a 136$(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a $(BITMAPLIBS)
137 @echo "DLL "`basename $@` 137 @echo "DLL "`basename $@`
138 $(SILENT)$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $< 138 $(SILENT)$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $<
139 $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libplugin.a $(BITMAPLIBS) \ 139 $(SILENT)$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $< $(BUILDDIR)/libplugin.a $(BITMAPLIBS) \
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-27 17:19:54 +0000