From 212a7a3fa76002f7ddfd4e822fd3a3baf6d8fbf3 Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 12 Sep 2003 22:44:03 +0000 Subject: [PATCH] build tweaks --- pandatool/src/egg-mkfont/eggMakeFont.cxx | 6 +++--- pandatool/src/palettizer/Sources.pp | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pandatool/src/egg-mkfont/eggMakeFont.cxx b/pandatool/src/egg-mkfont/eggMakeFont.cxx index 29f87b72eb..ca35f63a99 100644 --- a/pandatool/src/egg-mkfont/eggMakeFont.cxx +++ b/pandatool/src/egg-mkfont/eggMakeFont.cxx @@ -257,7 +257,7 @@ run() { // want to keep the glyph textures full-sized, because the // palettizer will reduce them later. - _tex_margin *= _scale_factor; + _tex_margin = (int)(_tex_margin * _scale_factor); _poly_margin *= _scale_factor; _pixels_per_unit *= _scale_factor; _scale_factor = 1.0; @@ -267,8 +267,8 @@ run() { // If -nr was specified, but we're still palettizing, we don't // even want to reduce the palette images. Instead, we'll // generate extra-large palette images. - _palette_size[0] *= _palettize_scale_factor; - _palette_size[1] *= _palettize_scale_factor; + _palette_size[0] = (int)(_palette_size[0] * _palettize_scale_factor); + _palette_size[1] = (int)(_palette_size[1] * _palettize_scale_factor); _palettize_scale_factor = 1.0; } diff --git a/pandatool/src/palettizer/Sources.pp b/pandatool/src/palettizer/Sources.pp index dcab55182f..869e90d756 100644 --- a/pandatool/src/palettizer/Sources.pp +++ b/pandatool/src/palettizer/Sources.pp @@ -1,5 +1,7 @@ #begin ss_lib_target #define TARGET palettizer + #define LOCAL_LIBS \ + pandatoolbase #define OTHER_LIBS \ egg:c pgraph:c linmath:c putil:c express:c pnmimage:c pnmimagetypes:c \ event:c mathutil:c \