Fixed compile warning in ag.cc;
updated Makefile "dist" target to include DLLs for FTGL and FreeType git-svn-id: svn://anubis/anaglym/trunk@175 99a6e188-d820-4881-8870-2d33a10e2619
This commit is contained in:
parent
6647f81dc0
commit
1926668aa3
3
Makefile
3
Makefile
@ -106,6 +106,9 @@ ifeq ($(WINDOWS),1)
|
|||||||
cp -a $(shell which libpng12-0.dll) $@
|
cp -a $(shell which libpng12-0.dll) $@
|
||||||
cp -a $(shell which zlib1.dll) $@
|
cp -a $(shell which zlib1.dll) $@
|
||||||
cp -a $(shell which libtiff-3.dll) $@
|
cp -a $(shell which libtiff-3.dll) $@
|
||||||
|
cp -a $(shell which libftgl-2.dll) $@
|
||||||
|
cp -a $(shell which lua5.1.dll) $@
|
||||||
|
cp -a $(shell which freetype6.dll) $@
|
||||||
endif
|
endif
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
2
ag.cc
2
ag.cc
@ -379,7 +379,7 @@ namespace ag
|
|||||||
int argc = lua_gettop(L);
|
int argc = lua_gettop(L);
|
||||||
if (argc == 2 && lua_isstring(L, 1) && lua_isnumber(L, 2))
|
if (argc == 2 && lua_isstring(L, 1) && lua_isnumber(L, 2))
|
||||||
{
|
{
|
||||||
g_engine->getTextSize(lua_tostring(L, 1), lua_tonumber(L, 2),
|
g_engine->getTextSize(lua_tostring(L, 1), lua_tointeger(L, 2),
|
||||||
&width, &height);
|
&width, &height);
|
||||||
}
|
}
|
||||||
lua_pushnumber(L, width);
|
lua_pushnumber(L, width);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user