mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-31 10:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

DOS/DJGPP buildfix

Browse Source
This commit is contained in:
Brad Parker 2017-01-20 18:23:45 -05:00
parent e6c4327a1c
commit 1d3e1a6962
7 changed files with 36 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
command.c
View File

@ -35,8 +35,10 @@
#endif #endif
#ifdef HAVE_COMMAND #ifdef HAVE_COMMAND
#include <net/net_compat.h> #ifdef HAVE_NETWORKING
#include <net/net_socket.h> #include <net/net_compat.h>
#include <net/net_socket.h>
#endif
#include <string/stdstring.h> #include <string/stdstring.h>
#endif #endif

4
input/connect/joypad_connection.h
View File

@ -63,10 +63,10 @@ joypad_connection_t *pad_connection_init(unsigned pads);
void pad_connection_destroy(joypad_connection_t *joyconn); void pad_connection_destroy(joypad_connection_t *joyconn);
void pad_connection_pad_deinit(joypad_connection_t *joyconn, void pad_connection_pad_deinit(joypad_connection_t *joyconn,
unsigned idx); uint32_t idx);
void pad_connection_packet(joypad_connection_t *joyconn, void pad_connection_packet(joypad_connection_t *joyconn,
unsigned idx, uint8_t* data, uint32_t length); uint32_t idx, uint8_t* data, uint32_t length);
uint64_t pad_connection_get_buttons(joypad_connection_t *joyconn, uint64_t pad_connection_get_buttons(joypad_connection_t *joyconn,
unsigned idx); unsigned idx);

4
libretro-common/features/features_cpu.c
View File

@ -44,7 +44,7 @@
#endif #endif
#elif defined(_XBOX360) #elif defined(_XBOX360)
#include <PPCIntrinsics.h> #include <PPCIntrinsics.h>
#elif defined(_POSIX_MONOTONIC_CLOCK) || defined(ANDROID) || defined(__QNX__) #elif defined(_POSIX_MONOTONIC_CLOCK) || defined(ANDROID) || defined(__QNX__) || defined(DJGPP)
/* POSIX_MONOTONIC_CLOCK is not being defined in Android headers despite support being present. */ /* POSIX_MONOTONIC_CLOCK is not being defined in Android headers despite support being present. */
#include <time.h> #include <time.h>
#endif #endif
@ -215,7 +215,7 @@ retro_time_t cpu_features_get_time_usec(void)
return tv.tv_sec * INT64_C(1000000) + (tv.tv_nsec + 500) / 1000; return tv.tv_sec * INT64_C(1000000) + (tv.tv_nsec + 500) / 1000;
#elif defined(EMSCRIPTEN) #elif defined(EMSCRIPTEN)
return emscripten_get_now() * 1000; return emscripten_get_now() * 1000;
#elif defined(__mips__) #elif defined(__mips__) || defined(DJGPP)
struct timeval tv; struct timeval tv;
gettimeofday(&tv,NULL); gettimeofday(&tv,NULL);
return (1000000 * tv.tv_sec + tv.tv_usec); return (1000000 * tv.tv_sec + tv.tv_usec);

4
libretro-common/include/math/float_minmax.h
View File

@ -39,7 +39,7 @@ static INLINE float float_min(float a, float b)
#ifdef __SSE2__ #ifdef __SSE2__
_mm_store_ss( &a, _mm_min_ss(_mm_set_ss(a),_mm_set_ss(b)) ); _mm_store_ss( &a, _mm_min_ss(_mm_set_ss(a),_mm_set_ss(b)) );
return a; return a;
#elif defined(__STDC_C99__) || defined(__STDC_C11__) #elif !defined(DJGPP) && (defined(__STDC_C99__) || defined(__STDC_C11__))
return fminf(a, b); return fminf(a, b);
#else #else
return MIN(a, b); return MIN(a, b);
@ -51,7 +51,7 @@ static INLINE float float_max(float a, float b)
#ifdef __SSE2__ #ifdef __SSE2__
_mm_store_ss( &a, _mm_max_ss(_mm_set_ss(a),_mm_set_ss(b)) ); _mm_store_ss( &a, _mm_max_ss(_mm_set_ss(a),_mm_set_ss(b)) );
return a; return a;
#elif defined(__STDC_C99__) || defined(__STDC_C11__) #elif !defined(DJGPP) && (defined(__STDC_C99__) || defined(__STDC_C11__))
return fmaxf(a, b); return fmaxf(a, b);
#else #else
return MAX(a, b); return MAX(a, b);

20
libretro-common/include/retro_miscellaneous.h
View File

@ -83,6 +83,26 @@
#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
#define RARCH_SCALE_BASE 256 #define RARCH_SCALE_BASE 256
#ifdef DJGPP
#define timespec timeval
#define tv_nsec tv_usec
#include <unistd.h>
extern int nanosleep(const struct timespec *rqtp, struct timespec *rmtp);
static int nanosleepDOS(const struct timespec *rqtp, struct timespec *rmtp)
{
usleep(1000000 * rqtp->tv_sec + rqtp->tv_nsec / 1000);
if (rmtp)
rmtp->tv_sec = rmtp->tv_nsec=0;
return 0;
}
#define nanosleep nanosleepDOS
#endif
/** /**
* retro_sleep: * retro_sleep:
* @msec : amount in milliseconds to sleep * @msec : amount in milliseconds to sleep

5
qb/config.libs.sh
View File

@ -152,6 +152,11 @@ else
add_define_make MAN_DIR "${PREFIX}/share/man" add_define_make MAN_DIR "${PREFIX}/share/man"
fi fi
if [ "$OS" = 'DOS' ]; then
HAVE_SHADERPIPELINE=no
HAVE_LANGEXTRA=no
fi
if [ "$OS" = 'Win32' ]; then if [ "$OS" = 'Win32' ]; then
HAVE_THREADS=yes HAVE_THREADS=yes
HAVE_THREAD_STORAGE=yes HAVE_THREAD_STORAGE=yes

1
qb/qb.system.sh
View File

@ -2,6 +2,7 @@
if [ -n "$CROSS_COMPILE" ]; then if [ -n "$CROSS_COMPILE" ]; then
case "$CROSS_COMPILE" in case "$CROSS_COMPILE" in
*'-mingw32'*) OS='Win32';; *'-mingw32'*) OS='Win32';;
*'-msdosdjgpp'*) OS='DOS';;
*);; *);;
esac esac
fi fi