Skip to content
Snippets Groups Projects
Commit 235bd483 authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Fix eduke32 on i686

parent 8cfb5c69
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
recipes/eduke32/redox.patch
+ 16
− 13
View file @ 235bd483
diff -rupwN source/Common.mak source-new/Common.mak diff -rupwN source/Common.mak source-new/Common.mak
--- source/Common.mak 2018-07-14 15:36:44.000000000 -0600 --- source/Common.mak 2018-07-14 15:36:44.000000000 -0600
+++ source-new/Common.mak 2019-03-15 21:28:32.366856380 -0600 +++ source-new/Common.mak 2023-01-20 10:38:24.948044222 -0700
@@ -93,7 +93,7 @@ endif @@ -93,7 +93,7 @@ endif
##### Makefile meta-settings ##### Makefile meta-settings
...@@ -21,22 +21,24 @@ diff -rupwN source/Common.mak source-new/Common.mak ...@@ -21,22 +21,24 @@ diff -rupwN source/Common.mak source-new/Common.mak
CC := $(CROSS)gcc$(CROSS_SUFFIX) CC := $(CROSS)gcc$(CROSS_SUFFIX)
CXX := $(CROSS)g++$(CROSS_SUFFIX) CXX := $(CROSS)g++$(CROSS_SUFFIX)
@@ -383,6 +387,14 @@ else ifeq ($(PLATFORM),$(filter $(PLATFO @@ -383,6 +387,16 @@ else ifeq ($(PLATFORM),$(filter $(PLATFO
override NOASM := 1 override NOASM := 1
else ifeq ($(PLATFORM),$(filter $(PLATFORM),BEOS SKYOS)) else ifeq ($(PLATFORM),$(filter $(PLATFORM),BEOS SKYOS))
override NOASM := 1 override NOASM := 1
+else ifeq ($(PLATFORM),REDOX) +else ifeq ($(PLATFORM),REDOX)
+ override USE_OPENGL := 0
+ override NETCODE := 0
+ override HAVE_GTK2 := 0
+ override HAVE_FLAC := 0 + override HAVE_FLAC := 0
+ override HAVE_GTK2 := 0
+ override HAVE_XMP := 0 + override HAVE_XMP := 0
+ override MIXERTYPE := SDL + override MIXERTYPE := SDL
+ override NETCODE := 0
+ override NOASM := 1
+ override USE_OPENGL := 0
+ OPTOPT := -mtune=generic
+ SDL_TARGET := 1 + SDL_TARGET := 1
endif endif
ifneq (i386,$(strip $(IMPLICIT_ARCH))) ifneq (i386,$(strip $(IMPLICIT_ARCH)))
@@ -868,7 +880,7 @@ ifeq ($(RENDERTYPE),SDL) @@ -868,7 +882,7 @@ ifeq ($(RENDERTYPE),SDL)
SDLCONFIG := sdl2-config SDLCONFIG := sdl2-config
SDLNAME := SDL2 SDLNAME := SDL2
else ifeq ($(SDL_TARGET),1) else ifeq ($(SDL_TARGET),1)
...@@ -45,7 +47,7 @@ diff -rupwN source/Common.mak source-new/Common.mak ...@@ -45,7 +47,7 @@ diff -rupwN source/Common.mak source-new/Common.mak
SDLNAME := SDL SDLNAME := SDL
ifeq (0,$(RELEASE)) ifeq (0,$(RELEASE))
COMPILERFLAGS += -DNOSDLPARACHUTE COMPILERFLAGS += -DNOSDLPARACHUTE
@@ -957,9 +969,11 @@ else ifeq ($(PLATFORM),WII) @@ -957,9 +971,11 @@ else ifeq ($(PLATFORM),WII)
LIBS += -laesnd_tueidj -lfat -lwiiuse -lbte -lwiikeyboard -logc LIBS += -laesnd_tueidj -lfat -lwiiuse -lbte -lwiikeyboard -logc
else ifeq ($(SUBPLATFORM),LINUX) else ifeq ($(SUBPLATFORM),LINUX)
LIBS += -lrt LIBS += -lrt
...@@ -58,9 +60,10 @@ diff -rupwN source/Common.mak source-new/Common.mak ...@@ -58,9 +60,10 @@ diff -rupwN source/Common.mak source-new/Common.mak
ifneq ($(PLATFORM),BSD) ifneq ($(PLATFORM),BSD)
LIBS += -ldl LIBS += -ldl
endif endif
Binary files source/.Common.mak.swp and source-new/.Common.mak.swp differ
diff -rupwN source/source/build/include/compat.h source-new/source/build/include/compat.h diff -rupwN source/source/build/include/compat.h source-new/source/build/include/compat.h
--- source/source/build/include/compat.h 2018-10-06 23:21:24.000000000 -0600 --- source/source/build/include/compat.h 2018-10-06 23:21:24.000000000 -0600
+++ source-new/source/build/include/compat.h 2019-03-15 21:21:09.285856877 -0600 +++ source-new/source/build/include/compat.h 2023-01-20 10:31:10.843745693 -0700
@@ -7,6 +7,9 @@ @@ -7,6 +7,9 @@
#pragma once #pragma once
...@@ -92,7 +95,7 @@ diff -rupwN source/source/build/include/compat.h source-new/source/build/include ...@@ -92,7 +95,7 @@ diff -rupwN source/source/build/include/compat.h source-new/source/build/include
#if defined(__cplusplus) && defined(_MSC_VER) #if defined(__cplusplus) && defined(_MSC_VER)
diff -rupwN source/source/build/src/baselayer.cpp source-new/source/build/src/baselayer.cpp diff -rupwN source/source/build/src/baselayer.cpp source-new/source/build/src/baselayer.cpp
--- source/source/build/src/baselayer.cpp 2018-10-06 23:21:43.000000000 -0600 --- source/source/build/src/baselayer.cpp 2018-10-06 23:21:43.000000000 -0600
+++ source-new/source/build/src/baselayer.cpp 2019-03-15 21:21:09.285856877 -0600 +++ source-new/source/build/src/baselayer.cpp 2023-01-20 10:31:49.591772332 -0700
@@ -498,7 +498,7 @@ int32_t baselayer_init(void) @@ -498,7 +498,7 @@ int32_t baselayer_init(void)
void maybe_redirect_outputs(void) void maybe_redirect_outputs(void)
...@@ -104,7 +107,7 @@ diff -rupwN source/source/build/src/baselayer.cpp source-new/source/build/src/ba ...@@ -104,7 +107,7 @@ diff -rupwN source/source/build/src/baselayer.cpp source-new/source/build/src/ba
// pipe standard outputs to files // pipe standard outputs to files
diff -rupwN source/source/build/src/sdlayer.cpp source-new/source/build/src/sdlayer.cpp diff -rupwN source/source/build/src/sdlayer.cpp source-new/source/build/src/sdlayer.cpp
--- source/source/build/src/sdlayer.cpp 2018-10-06 23:23:44.000000000 -0600 --- source/source/build/src/sdlayer.cpp 2018-10-06 23:23:44.000000000 -0600
+++ source-new/source/build/src/sdlayer.cpp 2019-03-15 21:21:09.289856979 -0600 +++ source-new/source/build/src/sdlayer.cpp 2023-01-20 10:30:49.223730830 -0700
@@ -305,7 +305,7 @@ void wm_setapptitle(const char *name) @@ -305,7 +305,7 @@ void wm_setapptitle(const char *name)
// //
...@@ -116,7 +119,7 @@ diff -rupwN source/source/build/src/sdlayer.cpp source-new/source/build/src/sdla ...@@ -116,7 +119,7 @@ diff -rupwN source/source/build/src/sdlayer.cpp source-new/source/build/src/sdla
#endif #endif
diff -rupwN source/source/duke3d/src/common.cpp source-new/source/duke3d/src/common.cpp diff -rupwN source/source/duke3d/src/common.cpp source-new/source/duke3d/src/common.cpp
--- source/source/duke3d/src/common.cpp 2018-10-06 23:20:23.000000000 -0600 --- source/source/duke3d/src/common.cpp 2018-10-06 23:20:23.000000000 -0600
+++ source-new/source/duke3d/src/common.cpp 2019-03-15 21:21:09.289856979 -0600 +++ source-new/source/duke3d/src/common.cpp 2023-01-20 10:30:49.223730830 -0700
@@ -1173,6 +1173,7 @@ int32_t S_OpenAudio(const char *fn, char @@ -1173,6 +1173,7 @@ int32_t S_OpenAudio(const char *fn, char
Bfree(testfn); Bfree(testfn);
return origfp; return origfp;
...@@ -132,7 +135,7 @@ diff -rupwN source/source/duke3d/src/common.cpp source-new/source/duke3d/src/com ...@@ -132,7 +135,7 @@ diff -rupwN source/source/duke3d/src/common.cpp source-new/source/duke3d/src/com
-#endif -#endif
diff -rupwN source/source/duke3d/src/game.cpp source-new/source/duke3d/src/game.cpp diff -rupwN source/source/duke3d/src/game.cpp source-new/source/duke3d/src/game.cpp
--- source/source/duke3d/src/game.cpp 2018-10-06 23:23:48.000000000 -0600 --- source/source/duke3d/src/game.cpp 2018-10-06 23:23:48.000000000 -0600
+++ source-new/source/duke3d/src/game.cpp 2019-03-15 21:21:09.293857082 -0600 +++ source-new/source/duke3d/src/game.cpp 2023-01-20 10:30:49.223730830 -0700
@@ -6697,7 +6697,7 @@ MAIN_LOOP_RESTART: @@ -6697,7 +6697,7 @@ MAIN_LOOP_RESTART:
static char buf[128]; static char buf[128];
#ifndef GEKKO #ifndef GEKKO
...@@ -144,7 +147,7 @@ diff -rupwN source/source/duke3d/src/game.cpp source-new/source/duke3d/src/game. ...@@ -144,7 +147,7 @@ diff -rupwN source/source/duke3d/src/game.cpp source-new/source/duke3d/src/game.
{ {
diff -rupwN source/source/enet/include/enet/unix.h source-new/source/enet/include/enet/unix.h diff -rupwN source/source/enet/include/enet/unix.h source-new/source/enet/include/enet/unix.h
--- source/source/enet/include/enet/unix.h 2014-06-16 17:16:08.000000000 -0600 --- source/source/enet/include/enet/unix.h 2014-06-16 17:16:08.000000000 -0600
+++ source-new/source/enet/include/enet/unix.h 2019-03-15 21:21:09.293857082 -0600 +++ source-new/source/enet/include/enet/unix.h 2023-01-20 10:30:49.223730830 -0700
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
#define __ENET_UNIX_H__ #define __ENET_UNIX_H__
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment