m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build on Windows ( $shell in makefile). Lua: waitinput now additionally returns mouse position in image coordinates

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1819 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Yves Rizoud 2011-07-16 18:57:55 +00:00
parent 6672966661
commit 51ddfe4f86
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Makefile
View File

@ -50,8 +50,8 @@ ifdef COMSPEC
RMDIR = rmdir --ignore-fail-on-non-empty RMDIR = rmdir --ignore-fail-on-non-empty
CP = cp CP = cp
BIN = ../bin/grafx2.exe BIN = ../bin/grafx2.exe
COPT = -W -Wall -Wdeclaration-after-statement -O$(OPTIM) -g -ggdb $(shell sdl-config --cflags) $(TTFCOPT) $(JOYCOPT) $(VKEYCOPT) $(LUACOPT) $(LAYERCOPT) COPT = -W -Wall -Wdeclaration-after-statement -O$(OPTIM) -g -ggdb `sdl-config --cflags` $(TTFCOPT) $(JOYCOPT) $(VKEYCOPT) $(LUACOPT) $(LAYERCOPT)
LOPT = $(shell sdl-config --libs) -lSDL_image $(TTFLOPT) -lpng14 $(LUALOPT) LOPT = `sdl-config --libs` -lSDL_image $(TTFLOPT) -lpng14 $(LUALOPT)
LUALOPT = -llua LUALOPT = -llua
CC = gcc CC = gcc
OBJDIR = ../obj/win32 OBJDIR = ../obj/win32

4
src/factory.c
View File

@ -1232,13 +1232,15 @@ int L_WaitInput(lua_State* L)
lua_pushinteger(L, Mouse_X); lua_pushinteger(L, Mouse_X);
lua_pushinteger(L, Mouse_Y); lua_pushinteger(L, Mouse_Y);
lua_pushinteger(L, Mouse_K); lua_pushinteger(L, Mouse_K);
lua_pushinteger(L, Paintbrush_X);
lua_pushinteger(L, Paintbrush_Y);
// The event arguments are in the stack. // The event arguments are in the stack.
// Need to reset "Key" here, so that a key event will not be // Need to reset "Key" here, so that a key event will not be
// created again before an actual key repeat occurs. // created again before an actual key repeat occurs.
Key=0; Key=0;
return 5; return 7;
} }
int L_UpdateScreen(lua_State* L) int L_UpdateScreen(lua_State* L)