Search
lxdream.org :: lxdream :: r1086:29776415438d
lxdream 0.9.1
released Jun 29
Download Now
changeset1086:29776415438d
parent1085:0be1958dd207
child1087:d54c499b48c7
authornkeynes
dateFri Dec 04 08:44:02 2009 +1000 (10 years ago)
Fix out-of-tree generation of mac_keymap.h
src/Makefile.am
src/Makefile.in
src/drivers/video_osx.m
1.1 --- a/src/Makefile.am Wed Dec 02 11:18:40 2009 +1000
1.2 +++ b/src/Makefile.am Fri Dec 04 08:44:02 2009 +1000
1.3 @@ -237,20 +237,21 @@
1.4 test_testxlt_SOURCES = test/testxlt.c xlat/xltcache.c xlat/xltcache.h
1.5
1.6 sh4/sh4core.c: gendec sh4/sh4.def sh4/sh4core.in
1.7 - mkdir -p `dirname $@`
1.8 + $(mkdir_p) `dirname $@`
1.9 ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4core.in -o $@
1.10 sh4/sh4dasm.c: gendec sh4/sh4.def sh4/sh4dasm.in
1.11 - mkdir -p `dirname $@`
1.12 + $(mkdir_p) `dirname $@`
1.13 ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4dasm.in -o $@
1.14 sh4/sh4x86.c: gendec sh4/sh4.def sh4/sh4x86.in
1.15 - mkdir -p `dirname $@`
1.16 + $(mkdir_p) `dirname $@`
1.17 ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4x86.in -o $@
1.18 sh4/sh4stat.c: gendec sh4/sh4.def sh4/sh4stat.in
1.19 - mkdir -p `dirname $@`
1.20 + $(mkdir_p) `dirname $@`
1.21 ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4stat.in -o $@
1.22 pvr2/gl_slsrc.c: genglsl pvr2/vertex.glsl pvr2/fragment.glsl
1.23 - mkdir -p `dirname $@`
1.24 + $(mkdir_p) `dirname $@`
1.25 ./genglsl $(srcdir)/pvr2/vertex.glsl $(srcdir)/pvr2/fragment.glsl $@
1.26 drivers/mac_keymap.h: drivers/mac_keymap.txt drivers/genkeymap.pl
1.27 + $(mkdir_p) `dirname $@`
1.28 $(srcdir)/drivers/genkeymap.pl mac $(srcdir)/drivers/mac_keymap.txt > $@
1.29
1.30 \ No newline at end of file
2.1 --- a/src/Makefile.in Wed Dec 02 11:18:40 2009 +1000
2.2 +++ b/src/Makefile.in Fri Dec 04 08:44:02 2009 +1000
2.3 @@ -3017,21 +3017,22 @@
2.4 @BUILD_SHARED_TRUE@@INPUT_LIRC_TRUE@ $(COMPILE) -DPLUGIN $(PLUGINCFLAGS) -c $< -o $@
2.5
2.6 sh4/sh4core.c: gendec sh4/sh4.def sh4/sh4core.in
2.7 - mkdir -p `dirname $@`
2.8 + $(mkdir_p) `dirname $@`
2.9 ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4core.in -o $@
2.10 sh4/sh4dasm.c: gendec sh4/sh4.def sh4/sh4dasm.in
2.11 - mkdir -p `dirname $@`
2.12 + $(mkdir_p) `dirname $@`
2.13 ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4dasm.in -o $@
2.14 sh4/sh4x86.c: gendec sh4/sh4.def sh4/sh4x86.in
2.15 - mkdir -p `dirname $@`
2.16 + $(mkdir_p) `dirname $@`
2.17 ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4x86.in -o $@
2.18 sh4/sh4stat.c: gendec sh4/sh4.def sh4/sh4stat.in
2.19 - mkdir -p `dirname $@`
2.20 + $(mkdir_p) `dirname $@`
2.21 ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4stat.in -o $@
2.22 pvr2/gl_slsrc.c: genglsl pvr2/vertex.glsl pvr2/fragment.glsl
2.23 - mkdir -p `dirname $@`
2.24 + $(mkdir_p) `dirname $@`
2.25 ./genglsl $(srcdir)/pvr2/vertex.glsl $(srcdir)/pvr2/fragment.glsl $@
2.26 drivers/mac_keymap.h: drivers/mac_keymap.txt drivers/genkeymap.pl
2.27 + $(mkdir_p) `dirname $@`
2.28 $(srcdir)/drivers/genkeymap.pl mac $(srcdir)/drivers/mac_keymap.txt > $@
2.29 # Tell versions [3.59,3.63) of GNU make to not export all variables.
2.30 # Otherwise a system limit (for SysV at least) may be exceeded.
3.1 --- a/src/drivers/video_osx.m Wed Dec 02 11:18:40 2009 +1000
3.2 +++ b/src/drivers/video_osx.m Fri Dec 04 08:44:02 2009 +1000
3.3 @@ -28,7 +28,7 @@
3.4 #include "pvr2/pvr2.h"
3.5 #import <AppKit/AppKit.h>
3.6
3.7 -#include "mac_keymap.h"
3.8 +#include "drivers/mac_keymap.h"
3.9
3.10 #define MOUSE_X_SCALE 5
3.11 #define MOUSE_Y_SCALE 5
.