Public_Skunkworks/singe
Public_Skunkworks/singe
1
0
Fork 0
Code Issues 12 Pull requests Projects Releases Packages Wiki Activity Actions

32 Bit Builds Working.

Browse source
This commit is contained in:
Scott Duensing 2023-10-26 21:20:44 -05:00
parent 59c7ef3ec8
commit 642742a1c8
5 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -244,8 +244,11 @@ add_executable(${CMAKE_PROJECT_NAME}
if(WIN32) 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 set(DEFINE_LIST
-Dmain=SDL_main -Dmain=SDL_main
-D_WIN32_WINNT=0x0600
) )
else() else()
set(DEFINE_LIST) set(DEFINE_LIST)

10
build-all.sh
View file

@ -40,7 +40,7 @@ function buildAll() {
linux) linux)
case "${ARCH}" in case "${ARCH}" in
x86) x86)
TRIPLE="i386-linux-gnu" TRIPLE="i686-linux-gnu"
;; ;;
x86_64) x86_64)
TRIPLE="x86_64-linux-gnu" TRIPLE="x86_64-linux-gnu"
@ -78,7 +78,7 @@ function buildAll() {
export LD_LIBRARY_PATH=${G_TARGET} export LD_LIBRARY_PATH=${G_TARGET}
export PKG_CONFIG_LIBDIR=${G_TARGET}/lib/pkgconfig export PKG_CONFIG_LIBDIR=${G_TARGET}/lib/pkgconfig
:<<SKIP #:<<SKIP
pushd thirdparty/SDL2 pushd thirdparty/SDL2
clearAndEnterBuild clearAndEnterBuild
cmake ${COMMON} \ cmake ${COMMON} \
@ -117,6 +117,7 @@ function buildAll() {
-DSDL2MIXER_VENDORED=on \ -DSDL2MIXER_VENDORED=on \
-DSDL2MIXER_SAMPLES=off \ -DSDL2MIXER_SAMPLES=off \
-DSDL2_DIR=${G_TARGET}/lib/cmake/SDL2 \ -DSDL2_DIR=${G_TARGET}/lib/cmake/SDL2 \
-DWAVPACK_ENABLE_ASM=no \
.. ..
make install make install
popd 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 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 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 rm ${G_TARGET}/temp1.mkv ${G_TARGET}/temp2.mkv ${G_TARGET}/menuBackground.mkv
SKIP #SKIP
:<<UNUSED :<<UNUSED
# === Singe Manual === # === Singe Manual ===
@ -385,8 +386,7 @@ function outputLicense() {
} }
# Bother with 32 bit anymore?
#buildAll linux x86 #buildAll linux x86
buildAll linux x86_64 buildAll linux x86_64
#buildAll windows x86 #buildAll windows x86
buildAll windows x86_64 #buildAll windows x86_64

6
cmake/i386-linux-gnu.cmake → cmake/i686-linux-gnu.cmake
View file

@ -19,11 +19,11 @@
set(CMAKE_SYSTEM_NAME Linux) 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_C_FLAGS -m32)
set(CMAKE_CXX_COMPILER g++) set(CMAKE_CXX_COMPILER i686-linux-gnu-g++)
set(CMAKE_CXX_FLAGS -m32) set(CMAKE_CXX_FLAGS -m32)
set(KANGAROO_OS linux) set(KANGAROO_OS linux)

8
src/main.c
View file

@ -589,13 +589,13 @@ void launcher(char *exeName, ConfigT *conf) {
temp = NULL; temp = NULL;
} }
// Init SDL_mixer ***FIX*** // Init SDL_mixer
flags = /* MIX_INIT_FLAC | */ MIX_INIT_MOD | /* MIX_INIT_MP3 | */ MIX_INIT_OGG | MIX_INIT_MID | MIX_INIT_OPUS; 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); err = Mix_Init(flags);
if (err != flags) utilDie("%s", Mix_GetError()); if (err != flags) utilDie("%s", Mix_GetError());
// Init SDL_image ***FIX*** // Init SDL_image
flags = IMG_INIT_JPG | IMG_INIT_PNG | /* IMG_INIT_TIF | */ IMG_INIT_WEBP; flags = IMG_INIT_AVIF | IMG_INIT_JPG | IMG_INIT_JXL | IMG_INIT_PNG | IMG_INIT_TIF | IMG_INIT_WEBP;
err = IMG_Init(flags); err = IMG_Init(flags);
if (err != flags) utilDie("%s", IMG_GetError()); if (err != flags) utilDie("%s", IMG_GetError());

3
src/singe.c
View file

@ -40,6 +40,8 @@
// There is no serial.h, so fake it. // There is no serial.h, so fake it.
LUASOCKET_API int luaopen_socket_serial(lua_State *L); LUASOCKET_API int luaopen_socket_serial(lua_State *L);
#endif #endif
// There is no header for rs232 binding. Make our own.
int luaopen_luars232(lua_State *L);
#include "main.h" #include "main.h"
#include "util.h" #include "util.h"
@ -4343,6 +4345,7 @@ void startLuaContext(lua_State *L) {
luaPreload(L, "lfs", luaopen_lfs); luaPreload(L, "lfs", luaopen_lfs);
luaPreload(L, "socket.core", luaopen_socket_core); luaPreload(L, "socket.core", luaopen_socket_core);
luaPreload(L, "mime.core", luaopen_mime_core); luaPreload(L, "mime.core", luaopen_mime_core);
luaPreload(L, "rs232", luaopen_luars232);
#ifndef _WIN32 #ifndef _WIN32
luaPreload(L, "socket.unix", luaopen_socket_unix); luaPreload(L, "socket.unix", luaopen_socket_unix);
luaPreload(L, "socket.serial", luaopen_socket_serial); luaPreload(L, "socket.serial", luaopen_socket_serial);