Merge branch 'tiny-makefile-fix' into 'master'

Tiny Makefile Fix

See merge request STJr/SRB2!289
This commit is contained in:
Monster Iestyn 2018-12-04 08:09:27 -05:00
commit d1a8e3acdb
3 changed files with 5 additions and 5 deletions

View file

@ -20,7 +20,7 @@ GCC64=1
endif endif
ifdef GCC64 ifdef GCC64
GCC64=1 GCC63=1
endif endif
ifdef GCC63 ifdef GCC63

View file

@ -492,8 +492,8 @@ static void GIF_framewrite(void)
// screen regions are handled in GIF_lzw // screen regions are handled in GIF_lzw
{ {
int d1 = (int)((100.0/NEWTICRATE)*(gif_frames+1)); int d1 = (int)((100.0f/NEWTICRATE)*(gif_frames+1));
int d2 = (int)((100.0/NEWTICRATE)*(gif_frames)); int d2 = (int)((100.0f/NEWTICRATE)*(gif_frames));
UINT16 delay = d1-d2; UINT16 delay = d1-d2;
INT32 startline; INT32 startline;

View file

@ -50,8 +50,8 @@
#ifdef HAVE_LIBGME #ifdef HAVE_LIBGME
#include "gme/gme.h" #include "gme/gme.h"
#define GME_TREBLE 5.0 #define GME_TREBLE 5.0f
#define GME_BASS 1.0 #define GME_BASS 1.0f
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
#ifndef _MSC_VER #ifndef _MSC_VER