sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix build

Browse source
This commit is contained in:
Jose Alonso Cardenas Marquez 2015-06-17 00:02:55 +00:00
parent 999f1f5247
commit 3092ade24b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=389890
2 changed files with 4 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-src-Glide64_Util.h
View file

@ -1,22 +1,6 @@
--- source/mupen64plus-video-glide64mk2/src/Glide64/Util.h.orig 2013-07-03 20:28:17.000000000 -0400 --- source/mupen64plus-video-glide64mk2/src/Glide64/Util.h 2015-06-12 20:48:15.000000000 -0500
+++ source/mupen64plus-video-glide64mk2/src/Glide64/Util.h 2014-09-01 12:32:50.282026994 -0400 +++ source/mupen64plus-video-glide64mk2/src/Glide64/Util.h 2015-06-12 20:48:41.000000000 -0500
@@ -40,6 +40,8 @@ @@ -94,6 +94,7 @@
#ifndef Util_H
#define Util_H
+#include <sys/endian.h>
+
#define NOT_TMU0 0x00
#define NOT_TMU1 0x01
#define NOT_TMU2 0x02
@@ -90,12 +92,11 @@
lx = lc; \
}
-#if defined(__GNUC__)
- #define bswap32(x) __builtin_bswap32(x)
-#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
+#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
#include <stdlib.h> #include <stdlib.h>
#define bswap32(x) _byteswap_ulong(x) #define bswap32(x) _byteswap_ulong(x)
#else #else
@ -24,7 +8,7 @@
static inline uint32_t bswap32(uint32_t val) static inline uint32_t bswap32(uint32_t val)
{ {
return (((val & 0xff000000) >> 24) | return (((val & 0xff000000) >> 24) |
@@ -104,6 +105,7 @@ @@ -102,6 +103,7 @@
((val & 0x000000ff) << 24)); ((val & 0x000000ff) << 24));
} }
#endif #endif

25
emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-src-GlideHQ_TxDbg.cpp
View file

@ -1,25 +0,0 @@
--- source/mupen64plus-video-glide64mk2/src/GlideHQ/TxDbg.cpp 2013-10-04 03:11:58.000000000 -0500
+++ source/mupen64plus-video-glide64mk2/src/GlideHQ/TxDbg.cpp 2013-10-04 03:16:46.000000000 -0500
@@ -53,7 +53,7 @@
void
TxDbg::output(const int level, const wchar_t *format, ...)
{
-#ifdef _GLIBCXX_HAVE_BROKEN_VSWPRINTF
+#if defined _GLIBCXX_HAVE_BROKEN_VSWPRINTF || defined (__FreeBSD__)
wchar_t newformat[4095];
#else
std::wstring newformat;
@@ -65,8 +65,12 @@
return;
va_start(args, format);
-#ifdef _GLIBCXX_HAVE_BROKEN_VSWPRINTF
+#if defined _GLIBCXX_HAVE_BROKEN_VSWPRINTF || defined (__FreeBSD__)
+#if defined(__FreeBSD__)
+ swprintf(newformat, sizeof(newformat)/sizeof(*newformat), L"%d:\t", level);
+#else
swprintf(newformat, L"%d:\t", level);
+#endif
wcscat(newformat, format);
vfwprintf(_dbgfile, newformat, args);
#else