Lua: make sure action.h gets C preprocessed before processing it

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21123 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 2 insertions, 8 deletions

diff --git a/apps/plugins/lua/action_helper.pl b/apps/plugins/lua/action_helper.pl
index b681951588..eb66c2b01e 100755
--- a/apps/plugins/lua/action_helper.pl
+++ b/apps/plugins/lua/action_helper.pl
@@ -18,13 +18,9 @@
 #
 ############################################################################
 
-$input = $ARGV[0] . "/../../action.h";
-
-open(ACTION, "<$input") or die "Can't open $input!";
-
 $i = 0;
 $j = 0;
-while(my $line = <ACTION>)
+while(my $line = <STDIN>)
 {
     chomp($line);
     if($line =~ /^\s*(ACTION_[^\s]+)(\s*=.*)?,\s*$/)
@@ -39,8 +35,6 @@ while(my $line = <ACTION>)
     }
 }
 
-close(ACTION);
-
 print "-- Don't change this file!\n";
 printf "-- It is automatically generated of action.h %s\n", '$Revision$';
 
diff --git a/apps/plugins/lua/lua.make b/apps/plugins/lua/lua.make
index 45d6739f25..596e32045f 100644
--- a/apps/plugins/lua/lua.make
+++ b/apps/plugins/lua/lua.make
@@ -33,7 +33,7 @@ endif
 $(LUA_BUILDDIR)/lua.rock: $(LUA_OBJ) $(LUA_BUILDDIR)/actions.lua
 
 $(LUA_BUILDDIR)/actions.lua: $(LUA_OBJ)
-        $(call PRINTS,GEN $(@F))$(LUA_SRCDIR)/action_helper.pl $(LUA_SRCDIR) > $@
+        $(call PRINTS,GEN $(@F))$(CC) $(PLUGINFLAGS) -E $(APPSDIR)/action.h | $(LUA_SRCDIR)/action_helper.pl > $(LUA_BUILDDIR)/actions.lua
 
 $(LUA_BUILDDIR)/lua.refmap: $(LUA_OBJ)