notaz.gp2x.de
/
pcsx_rearmed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
89f33b7
)
frontend: fix clean libretro build
author
notaz
<notasas@gmail.com>
Sun, 2 Dec 2012 00:43:40 +0000
(
02:43
+0200)
committer
notaz
<notasas@gmail.com>
Sun, 2 Dec 2012 01:02:51 +0000
(
03:02
+0200)
Makefile
patch
|
blob
|
blame
|
history
jni/Android.mk
patch
|
blob
|
blame
|
history
diff --git
a/Makefile
b/Makefile
index
493306c
..
0c7854d
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-192,7
+192,8
@@
endif
OBJS += frontend/main.o frontend/plugin.o
OBJS += frontend/main.o frontend/plugin.o
-frontend/menu.o frontend/main.o frontend/plat_sdl.o: frontend/revision.h
+frontend/menu.o frontend/main.o: frontend/revision.h
+frontend/plat_sdl.o frontend/libretro.o: frontend/revision.h
frontend/libpicofe/%.c:
@echo "libpicofe module is missing, please run:"
frontend/libpicofe/%.c:
@echo "libpicofe module is missing, please run:"
@@
-217,7
+218,7
@@
$(TARGET): $(OBJS)
$(CC_LINK) -o $@ $^ $(LDFLAGS) $(LDLIBS) -Wl,-Map=$@.map
clean: $(PLAT_CLEAN) clean_plugins
$(CC_LINK) -o $@ $^ $(LDFLAGS) $(LDLIBS) -Wl,-Map=$@.map
clean: $(PLAT_CLEAN) clean_plugins
- $(RM) $(TARGET) $(OBJS) $(TARGET).map
+ $(RM) $(TARGET) $(OBJS) $(TARGET).map
frontend/revision.h
ifneq ($(PLUGINS),)
plugins_: $(PLUGINS)
ifneq ($(PLUGINS),)
plugins_: $(PLUGINS)
diff --git
a/jni/Android.mk
b/jni/Android.mk
index
60db810
..
89af335
100644
(file)
--- a/
jni/Android.mk
+++ b/
jni/Android.mk
@@
-83,10
+83,8
@@
LOCAL_SRC_FILES += ../plugins/cdrcimg/cdrcimg.c
# dfinput
LOCAL_SRC_FILES += ../plugins/dfinput/main.c ../plugins/dfinput/pad.c ../plugins/dfinput/guncon.c
# dfinput
LOCAL_SRC_FILES += ../plugins/dfinput/main.c ../plugins/dfinput/pad.c ../plugins/dfinput/guncon.c
-#
gui
+#
misc
LOCAL_SRC_FILES += ../frontend/main.c ../frontend/plugin.c
LOCAL_SRC_FILES += ../frontend/main.c ../frontend/plugin.c
-LOCAL_SRC_FILES += ../frontend/common/fonts.c
-LOCAL_SRC_FILES += ../frontend/linux/plat.c
# libretro
LOCAL_SRC_FILES += ../frontend/libretro.c
# libretro
LOCAL_SRC_FILES += ../frontend/libretro.c