From 4ff087cc36d35342ff757ab064662302df605d2e Mon Sep 17 00:00:00 2001 From: Themaister Date: Sun, 9 Sep 2012 23:37:12 +0200 Subject: [PATCH] Fix CXX_BUILD. --- Makefile | 1 + Makefile.win | 1 + gfx/scaler/pixconv.c | 2 +- record/ffemu.c | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2a648e4b3c..0eaaa2fa2f 100644 --- a/Makefile +++ b/Makefile @@ -302,6 +302,7 @@ clean: rm -f conf/*.o rm -f gfx/*.o rm -f gfx/fonts/*.o + rm -f gfx/math/*.o rm -f gfx/context/*.o rm -f gfx/py_state/*.o rm -f gfx/scaler/*.o diff --git a/Makefile.win b/Makefile.win index a27dc1b324..5e3931f634 100644 --- a/Makefile.win +++ b/Makefile.win @@ -224,6 +224,7 @@ clean: rm -f gfx/scaler/*.o rm -f gfx/*.o rm -f gfx/context/*.o + rm -f gfx/math/*.o rm -f gfx/fonts/*.o rm -f gfx/py_state/*.o rm -f record/*.o diff --git a/gfx/scaler/pixconv.c b/gfx/scaler/pixconv.c index f32d74f4c5..33cfc1f00b 100644 --- a/gfx/scaler/pixconv.c +++ b/gfx/scaler/pixconv.c @@ -139,7 +139,7 @@ static inline void store_bgr24_sse2(void *output, __m128i a, __m128i b, __m128i __m128i c4 = _mm_slli_si128(_mm_and_si128(d, mask_2), 2); __m128i c5 = _mm_slli_si128(_mm_and_si128(d, mask_3), 1); - __m128i *out = output; + __m128i *out = (__m128i*)output; _mm_storeu_si128(out + 0, _mm_or_si128(a0, _mm_or_si128(a1, _mm_or_si128(a2, _mm_or_si128(a3, _mm_or_si128(a4, a5)))))); diff --git a/record/ffemu.c b/record/ffemu.c index 508311b806..36f4b6968c 100644 --- a/record/ffemu.c +++ b/record/ffemu.c @@ -601,7 +601,7 @@ static bool ffemu_push_video_thread(ffemu_t *handle, const struct ffemu_video_da { if (!data->is_dupe) { - if (data->width != handle->video.scaler.in_width || data->height != handle->video.scaler.in_height) + if ((int)data->width != handle->video.scaler.in_width || (int)data->height != handle->video.scaler.in_height) { handle->video.scaler.in_width = data->width; handle->video.scaler.in_height = data->height;