32 Bit Builds Working.
This commit is contained in:
parent
59c7ef3ec8
commit
642742a1c8
5 changed files with 18 additions and 12 deletions
|
@ -244,8 +244,11 @@ add_executable(${CMAKE_PROJECT_NAME}
|
|||
|
||||
|
||||
if(WIN32)
|
||||
# Note: _WIN32_WINNT=0x0600 sets the minimum compatible version of
|
||||
# Windows to Vista. The function inet_pton() does not exist before then.
|
||||
set(DEFINE_LIST
|
||||
-Dmain=SDL_main
|
||||
-D_WIN32_WINNT=0x0600
|
||||
)
|
||||
else()
|
||||
set(DEFINE_LIST)
|
||||
|
|
10
build-all.sh
10
build-all.sh
|
@ -40,7 +40,7 @@ function buildAll() {
|
|||
linux)
|
||||
case "${ARCH}" in
|
||||
x86)
|
||||
TRIPLE="i386-linux-gnu"
|
||||
TRIPLE="i686-linux-gnu"
|
||||
;;
|
||||
x86_64)
|
||||
TRIPLE="x86_64-linux-gnu"
|
||||
|
@ -78,7 +78,7 @@ function buildAll() {
|
|||
export LD_LIBRARY_PATH=${G_TARGET}
|
||||
export PKG_CONFIG_LIBDIR=${G_TARGET}/lib/pkgconfig
|
||||
|
||||
:<<SKIP
|
||||
#:<<SKIP
|
||||
pushd thirdparty/SDL2
|
||||
clearAndEnterBuild
|
||||
cmake ${COMMON} \
|
||||
|
@ -117,6 +117,7 @@ function buildAll() {
|
|||
-DSDL2MIXER_VENDORED=on \
|
||||
-DSDL2MIXER_SAMPLES=off \
|
||||
-DSDL2_DIR=${G_TARGET}/lib/cmake/SDL2 \
|
||||
-DWAVPACK_ENABLE_ASM=no \
|
||||
..
|
||||
make install
|
||||
popd
|
||||
|
@ -240,7 +241,7 @@ function buildAll() {
|
|||
ffmpeg -f concat -safe 0 -i <(echo -e "file ${G_TARGET}/temp1.mkv\nfile ${G_TARGET}/temp2.mkv\n") -c copy ${G_TARGET}/menuBackground.mkv
|
||||
createEmbeddedBinary ${G_TARGET}/menuBackground.mkv ${G_GENERATED}/menuBackground_mkv.h MENUBACKGROUND_MKV_H
|
||||
rm ${G_TARGET}/temp1.mkv ${G_TARGET}/temp2.mkv ${G_TARGET}/menuBackground.mkv
|
||||
SKIP
|
||||
#SKIP
|
||||
|
||||
:<<UNUSED
|
||||
# === Singe Manual ===
|
||||
|
@ -385,8 +386,7 @@ function outputLicense() {
|
|||
}
|
||||
|
||||
|
||||
# Bother with 32 bit anymore?
|
||||
#buildAll linux x86
|
||||
buildAll linux x86_64
|
||||
#buildAll windows x86
|
||||
buildAll windows x86_64
|
||||
#buildAll windows x86_64
|
||||
|
|
|
@ -19,11 +19,11 @@
|
|||
|
||||
|
||||
set(CMAKE_SYSTEM_NAME Linux)
|
||||
set(CMAKE_SYSTEM_PROCESSOR i386)
|
||||
set(CMAKE_SYSTEM_PROCESSOR i686)
|
||||
|
||||
set(CMAKE_C_COMPILER gcc)
|
||||
set(CMAKE_C_COMPILER i686-linux-gnu-gcc)
|
||||
set(CMAKE_C_FLAGS -m32)
|
||||
set(CMAKE_CXX_COMPILER g++)
|
||||
set(CMAKE_CXX_COMPILER i686-linux-gnu-g++)
|
||||
set(CMAKE_CXX_FLAGS -m32)
|
||||
|
||||
set(KANGAROO_OS linux)
|
|
@ -589,13 +589,13 @@ void launcher(char *exeName, ConfigT *conf) {
|
|||
temp = NULL;
|
||||
}
|
||||
|
||||
// Init SDL_mixer ***FIX***
|
||||
flags = /* MIX_INIT_FLAC | */ MIX_INIT_MOD | /* MIX_INIT_MP3 | */ MIX_INIT_OGG | MIX_INIT_MID | MIX_INIT_OPUS;
|
||||
// Init SDL_mixer
|
||||
flags = MIX_INIT_FLAC | MIX_INIT_MID | MIX_INIT_MOD | MIX_INIT_MP3 | MIX_INIT_OGG | MIX_INIT_OPUS | MIX_INIT_WAVPACK;
|
||||
err = Mix_Init(flags);
|
||||
if (err != flags) utilDie("%s", Mix_GetError());
|
||||
|
||||
// Init SDL_image ***FIX***
|
||||
flags = IMG_INIT_JPG | IMG_INIT_PNG | /* IMG_INIT_TIF | */ IMG_INIT_WEBP;
|
||||
// Init SDL_image
|
||||
flags = IMG_INIT_AVIF | IMG_INIT_JPG | IMG_INIT_JXL | IMG_INIT_PNG | IMG_INIT_TIF | IMG_INIT_WEBP;
|
||||
err = IMG_Init(flags);
|
||||
if (err != flags) utilDie("%s", IMG_GetError());
|
||||
|
||||
|
|
|
@ -40,6 +40,8 @@
|
|||
// There is no serial.h, so fake it.
|
||||
LUASOCKET_API int luaopen_socket_serial(lua_State *L);
|
||||
#endif
|
||||
// There is no header for rs232 binding. Make our own.
|
||||
int luaopen_luars232(lua_State *L);
|
||||
|
||||
#include "main.h"
|
||||
#include "util.h"
|
||||
|
@ -4343,6 +4345,7 @@ void startLuaContext(lua_State *L) {
|
|||
luaPreload(L, "lfs", luaopen_lfs);
|
||||
luaPreload(L, "socket.core", luaopen_socket_core);
|
||||
luaPreload(L, "mime.core", luaopen_mime_core);
|
||||
luaPreload(L, "rs232", luaopen_luars232);
|
||||
#ifndef _WIN32
|
||||
luaPreload(L, "socket.unix", luaopen_socket_unix);
|
||||
luaPreload(L, "socket.serial", luaopen_socket_serial);
|
||||
|
|
Loading…
Add table
Reference in a new issue