From 1926668aa3be1b700d06d794c5e3b84cbbfbd979 Mon Sep 17 00:00:00 2001 From: Josh Holtrop Date: Mon, 16 Nov 2009 16:32:04 +0000 Subject: [PATCH] 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 --- Makefile | 3 +++ ag.cc | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index be64bf0..a7f891f 100644 --- a/Makefile +++ b/Makefile @@ -106,6 +106,9 @@ ifeq ($(WINDOWS),1) cp -a $(shell which libpng12-0.dll) $@ cp -a $(shell which zlib1.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 clean: diff --git a/ag.cc b/ag.cc index 5e413ce..70f9000 100644 --- a/ag.cc +++ b/ag.cc @@ -379,7 +379,7 @@ namespace ag int argc = lua_gettop(L); 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); } lua_pushnumber(L, width);