diff options
author | Daniel Stenberg <daniel@haxx.se> | 2006-01-09 11:22:36 +0000 |
---|---|---|
committer | Daniel Stenberg <daniel@haxx.se> | 2006-01-09 11:22:36 +0000 |
commit | 0e419987e48b006104748118fa28161484b7dfa1 (patch) | |
tree | 45c1c1fe81309615e1e6d239183b677be90feb41 /apps/plugins | |
parent | d2a10f5676a4ab53aec437bd5976e2aef6bde0a4 (diff) | |
download | rockbox-0e419987e48b006104748118fa28161484b7dfa1.tar.gz rockbox-0e419987e48b006104748118fa28161484b7dfa1.zip |
SDL simulator brought by Nathan Hand and Nick Lanham. This is added as a third
simulator with the hope that once it works fine, we can remove the other two
and only have one unified simulator.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8312 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/plugins')
-rw-r--r-- | apps/plugins/Makefile | 17 | ||||
-rw-r--r-- | apps/plugins/databox/Makefile | 18 | ||||
-rw-r--r-- | apps/plugins/rockboy/Makefile | 18 | ||||
-rw-r--r-- | apps/plugins/searchengine/Makefile | 18 |
4 files changed, 68 insertions, 3 deletions
diff --git a/apps/plugins/Makefile b/apps/plugins/Makefile index 019a4590c8..98c66c6d46 100644 --- a/apps/plugins/Makefile +++ b/apps/plugins/Makefile | |||
@@ -86,6 +86,22 @@ else | |||
86 | endif | 86 | endif |
87 | 87 | ||
88 | else # end of x11-simulator | 88 | else # end of x11-simulator |
89 | ifeq ($(SIMVER), sdl) | ||
90 | ################################################### | ||
91 | # This is the SDL simulator version | ||
92 | |||
93 | $(OBJDIR)/%.rock : $(OBJDIR)/%.o $(BUILDDIR)/libplugin.a | ||
94 | @echo "LD "`basename $@` | ||
95 | @$(CC) $(CFLAGS) -shared $< -L$(BUILDDIR) $(CODECLIBS) -lplugin -o $@ | ||
96 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | ||
97 | # 'x' must be kept or you'll have "Win32 error 5" | ||
98 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | ||
99 | # #define ERROR_ACCESS_DENIED 5L | ||
100 | else | ||
101 | @chmod -x $@ | ||
102 | endif | ||
103 | |||
104 | else # end of sdl-simulator | ||
89 | ################################################### | 105 | ################################################### |
90 | # This is the win32 simulator version | 106 | # This is the win32 simulator version |
91 | DLLTOOLFLAGS = --export-all | 107 | DLLTOOLFLAGS = --export-all |
@@ -104,6 +120,7 @@ else | |||
104 | @chmod -x $@ | 120 | @chmod -x $@ |
105 | endif | 121 | endif |
106 | endif # end of win32-simulator | 122 | endif # end of win32-simulator |
123 | endif | ||
107 | 124 | ||
108 | endif # end of simulator section | 125 | endif # end of simulator section |
109 | 126 | ||
diff --git a/apps/plugins/databox/Makefile b/apps/plugins/databox/Makefile index 12b211d527..78387fd6f1 100644 --- a/apps/plugins/databox/Makefile +++ b/apps/plugins/databox/Makefile | |||
@@ -56,6 +56,22 @@ else | |||
56 | endif | 56 | endif |
57 | 57 | ||
58 | else # end of x11-simulator | 58 | else # end of x11-simulator |
59 | ifeq ($(SIMVER), sdl) | ||
60 | ################################################### | ||
61 | # This is the SDL simulator version | ||
62 | |||
63 | $(OUTPUT): $(OBJS) | ||
64 | @echo "LD $<" | ||
65 | @$(CC) $(CFLAGS) -shared $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | ||
66 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | ||
67 | # 'x' must be kept or you'll have "Win32 error 5" | ||
68 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | ||
69 | # #define ERROR_ACCESS_DENIED 5L | ||
70 | else | ||
71 | @chmod -x $@ | ||
72 | endif | ||
73 | |||
74 | else # end of sdl-simulator | ||
59 | ################################################### | 75 | ################################################### |
60 | # This is the win32 simulator version | 76 | # This is the win32 simulator version |
61 | DLLTOOLFLAGS = --export-all | 77 | DLLTOOLFLAGS = --export-all |
@@ -74,7 +90,7 @@ else | |||
74 | @chmod -x $@ | 90 | @chmod -x $@ |
75 | endif | 91 | endif |
76 | endif # end of win32-simulator | 92 | endif # end of win32-simulator |
77 | 93 | endif | |
78 | endif # end of simulator section | 94 | endif # end of simulator section |
79 | 95 | ||
80 | 96 | ||
diff --git a/apps/plugins/rockboy/Makefile b/apps/plugins/rockboy/Makefile index 23c614210a..3657e8d786 100644 --- a/apps/plugins/rockboy/Makefile +++ b/apps/plugins/rockboy/Makefile | |||
@@ -72,6 +72,22 @@ else | |||
72 | endif | 72 | endif |
73 | 73 | ||
74 | else # end of x11-simulator | 74 | else # end of x11-simulator |
75 | ifeq ($(SIMVER), sdl) | ||
76 | ################################################### | ||
77 | # This is the sdl simulator version | ||
78 | |||
79 | $(OUTPUT): $(OBJS) | ||
80 | @echo "LD $@" | ||
81 | @$(CC) $(CFLAGS) -shared $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | ||
82 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | ||
83 | # 'x' must be kept or you'll have "Win32 error 5" | ||
84 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | ||
85 | # #define ERROR_ACCESS_DENIED 5L | ||
86 | else | ||
87 | @chmod -x $@ | ||
88 | endif | ||
89 | |||
90 | else # end of sdl-simulator | ||
75 | ################################################### | 91 | ################################################### |
76 | # This is the win32 simulator version | 92 | # This is the win32 simulator version |
77 | DLLTOOLFLAGS = --export-all | 93 | DLLTOOLFLAGS = --export-all |
@@ -90,7 +106,7 @@ else | |||
90 | @chmod -x $@ | 106 | @chmod -x $@ |
91 | endif | 107 | endif |
92 | endif # end of win32-simulator | 108 | endif # end of win32-simulator |
93 | 109 | endif | |
94 | endif # end of simulator section | 110 | endif # end of simulator section |
95 | 111 | ||
96 | 112 | ||
diff --git a/apps/plugins/searchengine/Makefile b/apps/plugins/searchengine/Makefile index 26e8517db2..efa7d95d2d 100644 --- a/apps/plugins/searchengine/Makefile +++ b/apps/plugins/searchengine/Makefile | |||
@@ -56,6 +56,22 @@ else | |||
56 | endif | 56 | endif |
57 | 57 | ||
58 | else # end of x11-simulator | 58 | else # end of x11-simulator |
59 | ifeq ($(SIMVER), sdl) | ||
60 | ################################################### | ||
61 | # This is the SDL simulator version | ||
62 | |||
63 | $(OUTPUT): $(OBJS) | ||
64 | @echo "LD $<" | ||
65 | @$(CC) $(CFLAGS) -shared $(OBJS) -L$(BUILDDIR) -lplugin -o $@ | ||
66 | ifeq ($(findstring CYGWIN,$(UNAME)),CYGWIN) | ||
67 | # 'x' must be kept or you'll have "Win32 error 5" | ||
68 | # $ fgrep 5 /usr/include/w32api/winerror.h | head -1 | ||
69 | # #define ERROR_ACCESS_DENIED 5L | ||
70 | else | ||
71 | @chmod -x $@ | ||
72 | endif | ||
73 | |||
74 | else # end of sdl-simulator | ||
59 | ################################################### | 75 | ################################################### |
60 | # This is the win32 simulator version | 76 | # This is the win32 simulator version |
61 | DLLTOOLFLAGS = --export-all | 77 | DLLTOOLFLAGS = --export-all |
@@ -74,7 +90,7 @@ else | |||
74 | @chmod -x $@ | 90 | @chmod -x $@ |
75 | endif | 91 | endif |
76 | endif # end of win32-simulator | 92 | endif # end of win32-simulator |
77 | 93 | endif | |
78 | endif # end of simulator section | 94 | endif # end of simulator section |
79 | 95 | ||
80 | 96 | ||