mirrors/mkxp-z
1
0
Fork 0
mirror of https://github.com/mkxp-z/mkxp-z.git synced 2025-09-10 12:02:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' into macos

Browse source
This commit is contained in:
刘皓 2025-04-12 19:19:49 -04:00
commit 479789198a
No known key found for this signature in database
GPG key ID: 7901753DB465B711
4 changed files with 49 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
linux/Makefile
View file

@ -86,7 +86,7 @@ $(DOWNLOADS)/vorbis/cmakebuild/Makefile: $(DOWNLOADS)/vorbis/CMakeLists.txt
$(CMAKE) -DBUILD_SHARED_LIBS=no
$(DOWNLOADS)/vorbis/CMakeLists.txt:
$(CLONE) $(GITHUB)/xiph/vorbis $(DOWNLOADS)/vorbis
$(CLONE) $(GITHUB)/mkxp-z/vorbis $(DOWNLOADS)/vorbis
# Ogg, dependency of Vorbis

2
macos/Dependencies/common.make
View file

@ -90,7 +90,7 @@ $(DOWNLOADS)/vorbis/cmakebuild/Makefile: $(DOWNLOADS)/vorbis/CMakeLists.txt
$(CMAKE) -DBUILD_SHARED_LIBS=no
$(DOWNLOADS)/vorbis/CMakeLists.txt:
$(CLONE) $(GITHUB)/xiph/vorbis $(DOWNLOADS)/vorbis
$(CLONE) $(GITHUB)/mkxp-z/vorbis $(DOWNLOADS)/vorbis
# Ogg, dependency of Vorbis

50
src/util/serial-util.h
View file

@ -23,14 +23,11 @@
#define SERIALUTIL_H
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <SDL_endian.h>
#if SDL_BYTEORDER != SDL_LIL_ENDIAN
#error "Non little endian systems not supported"
#endif
static inline int32_t
readInt32(const char **dataP)
{
@ -39,23 +36,56 @@ readInt32(const char **dataP)
memcpy(&result, *dataP, 4);
*dataP += 4;
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
# ifdef _MSC_VER
static_assert(sizeof(unsigned long) == sizeof(int32_t), "unsigned long should be 32 bits");
result = (int32_t)_byteswap_ulong((unsigned long)result);
# else
result = (int32_t)__builtin_bswap32((uint32_t)result);
# endif
#endif
return result;
}
static inline double
readDouble(const char **dataP)
{
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
uint64_t result;
memcpy(&result, *dataP, 8);
*dataP += 8;
# ifdef _MSC_VER
result = (uint64_t)_byteswap_uint64((unsigned __int64)result);
# else
result = __builtin_bswap64(result);
# endif
return *(double *)&result;
#else
double result;
memcpy(&result, *dataP, 8);
*dataP += 8;
return result;
#endif
}
static inline void
writeInt32(char **dataP, int32_t value)
{
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
# ifdef _MSC_VER
static_assert(sizeof(unsigned long) == sizeof(int32_t), "unsigned long should be 32 bits");
value = (int32_t)_byteswap_ulong((unsigned long)value);
# else
value = (int32_t)__builtin_bswap32((uint32_t)value);
# endif
#endif
memcpy(*dataP, &value, 4);
*dataP += 4;
}
@ -63,7 +93,19 @@ writeInt32(char **dataP, int32_t value)
static inline void
writeDouble(char **dataP, double value)
{
#if SDL_BYTEORDER == SDL_BIG_ENDIAN
uint64_t valueUint = *(uint64_t *)&value;
# ifdef _MSC_VER
valueUint = (uint64_t)_byteswap_uint64((unsigned __int64)valueUint);
# else
valueUint = __builtin_bswap64(valueUint);
# endif
memcpy(*dataP, &valueUint, 8);
#else
memcpy(*dataP, &value, 8);
#endif
*dataP += 8;
}

2
windows/Makefile
View file

@ -81,7 +81,7 @@ $(DOWNLOADS)/vorbis/cmakebuild/Makefile: $(DOWNLOADS)/vorbis/CMakeLists.txt
$(CMAKE) -DBUILD_SHARED_LIBS=no
$(DOWNLOADS)/vorbis/CMakeLists.txt:
$(CLONE) $(GITHUB)/xiph/vorbis $(DOWNLOADS)/vorbis
$(CLONE) $(GITHUB)/mkxp-z/vorbis $(DOWNLOADS)/vorbis
# Ogg, dependency of Vorbis