1 files changed, 1 insertions, 39 deletions
diff --git a/apps/plugins/mpegplayer/Makefile b/apps/plugins/mpegplayer/Makefile
index 7f4e2e31aa..c43dde04bc 100644
--- a/apps/plugins/mpegplayer/Makefile
+++ b/apps/plugins/mpegplayer/Makefile
@@ -48,24 +48,6 @@ $(OBJDIR)/mpegplayer.elf: $(OBJS) $(LINKFILE) $(BUILDDIR)/libmad-mpegplayer.a
 $(OUTPUT): $(OBJDIR)/mpegplayer.elf
        $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@
 else
-ifeq ($(SIMVER), x11)
-###################################################
-# This is the X11 simulator version
-$(OUTPUT): $(OBJS) $(BUILDDIR)/libmad-mpegplayer.a
-        $(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -lmad-mpegplayer -o $@
-ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
-# 'x' must be kept or you'll have "Win32 error 5"
-#     $ fgrep 5 /usr/include/w32api/winerror.h | head -1
-#         #define ERROR_ACCESS_DENIED 5L
-else
-        @chmod -x $@
-endif
-else # end of x11-simulator
-ifeq ($(SIMVER), sdl)
-###################################################
 # This is the SDL simulator version
 $(OUTPUT): $(OBJS) $(BUILDDIR)/libmad-mpegplayer.a
@@ -78,27 +60,7 @@ else
        @chmod -x $@
 endif
-else # end of sdl-simulator
+endif # end of sdl-simulator
-###################################################
-# This is the win32 simulator version
-DLLTOOLFLAGS = --export-all
-DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
-$(OUTPUT): $(OBJS) $(BUILDDIR)/libmad-mpegplayer.a
-        $(call PRINTS,DLL $(@F))$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS)
-        $(SILENT)@$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \
-                $(BUILDDIR)/libplugin.a -o $@
-ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
-# 'x' must be kept or you'll have "Win32 error 5"
-#     $ fgrep 5 /usr/include/w32api/winerror.h | head -1
-#         #define ERROR_ACCESS_DENIED 5L
-else
-        @chmod -x $@
-endif
-endif # end of win32-simulator
-endif
-endif # end of simulator section
 include $(TOOLSDIR)/make.inc

diff --git a/apps/plugins/mpegplayer/Makefile b/apps/plugins/mpegplayer/Makefile index 7f4e2e31aa..c43dde04bc 100644 --- a/apps/plugins/mpegplayer/Makefile +++ b/apps/plugins/mpegplayer/Makefile
@@ -48,24 +48,6 @@ $(OBJDIR)/mpegplayer.elf: $(OBJS) $(LINKFILE) $(BUILDDIR)/libmad-mpegplayer.a
48	$(OUTPUT): $(OBJDIR)/mpegplayer.elf	48	$(OUTPUT): $(OBJDIR)/mpegplayer.elf
49	$(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@	49	$(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@
50	else	50	else
51
52	ifeq ($(SIMVER), x11)
53	###################################################
54	# This is the X11 simulator version
55
56	$(OUTPUT): $(OBJS) $(BUILDDIR)/libmad-mpegplayer.a
57	$(call PRINTS,LD $(@F))$(CC) $(CFLAGS) $(SHARED_FLAG) $(OBJS) -L$(BUILDDIR) -lplugin -lmad-mpegplayer -o $@
58	ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
59	# 'x' must be kept or you'll have "Win32 error 5"
60	# $ fgrep 5 /usr/include/w32api/winerror.h \| head -1
61	# #define ERROR_ACCESS_DENIED 5L
62	else
63	@chmod -x $@
64	endif
65
66	else # end of x11-simulator
67	ifeq ($(SIMVER), sdl)
68	###################################################
69	# This is the SDL simulator version	51	# This is the SDL simulator version
70		52
71	$(OUTPUT): $(OBJS) $(BUILDDIR)/libmad-mpegplayer.a	53	$(OUTPUT): $(OBJS) $(BUILDDIR)/libmad-mpegplayer.a
@@ -78,27 +60,7 @@ else
78	@chmod -x $@	60	@chmod -x $@
79	endif	61	endif
80		62
81	else # end of sdl-simulator	63	endif # end of sdl-simulator
82	###################################################
83	# This is the win32 simulator version
84	DLLTOOLFLAGS = --export-all
85	DLLWRAPFLAGS = -s --entry _DllMain@12 --target=i386-mingw32 -mno-cygwin
86
87	$(OUTPUT): $(OBJS) $(BUILDDIR)/libmad-mpegplayer.a
88	$(call PRINTS,DLL $(@F))$(DLLTOOL) $(DLLTOOLFLAGS) -z $(OBJDIR)/$*.def $(OBJS)
89	$(SILENT)@$(DLLWRAP) $(DLLWRAPFLAGS) --def $(OBJDIR)/$*.def $(OBJS) \
90	$(BUILDDIR)/libplugin.a -o $@
91	ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN)
92	# 'x' must be kept or you'll have "Win32 error 5"
93	# $ fgrep 5 /usr/include/w32api/winerror.h \| head -1
94	# #define ERROR_ACCESS_DENIED 5L
95	else
96	@chmod -x $@
97	endif
98	endif # end of win32-simulator
99	endif
100	endif # end of simulator section
101
102		64
103	include $(TOOLSDIR)/make.inc	65	include $(TOOLSDIR)/make.inc
104		66