Last active
December 18, 2015 20:29
-
-
Save neagix/5840769 to your computer and use it in GitHub Desktop.
neagix' Linux patches and build script for eduke32
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Index: Makefile | |
=================================================================== | |
--- Makefile (revision 3893) | |
+++ Makefile (working copy) | |
@@ -28,9 +28,9 @@ | |
OURCOMMONFLAGS=$(BASECOMMONFLAGS) \ | |
-I$(INC) -I$(EINC) -I$(SRC)/jmact -I$(JAUDIOLIBDIR)/include -I$(ENETDIR)/include | |
OURCFLAGS=$(OURCOMMONFLAGS) $(BASECFLAGS) | |
-OURCXXFLAGS=$(BASECXXFLAGS) | |
-OURCONLYFLAGS=$(BASECONLYFLAGS) | |
-OURASFLAGS=$(BASEASFLAGS) | |
+OURCXXFLAGS=$(CXXFLAGS) $(BASECXXFLAGS) | |
+OURCONLYFLAGS=$(CFLAGS) $(BASECONLYFLAGS) | |
+OURASFLAGS=$(ASFLAGS) $(BASEASFLAGS) | |
PRINTLDFLAGS=$(BASELDFLAGS) | |
OURLDFLAGS=$(OURCOMMONFLAGS) $(PRINTLDFLAGS) | |
Index: build/src/sdlayer.c | |
=================================================================== | |
--- build/src/sdlayer.c (revision 3893) | |
+++ build/src/sdlayer.c (working copy) | |
@@ -1177,7 +1177,7 @@ | |
static int32_t create_window_and_renderer(int32_t x, int32_t y, int32_t fs, uint32_t flags) | |
{ | |
- sdl_window = SDL_CreateWindow("", SDL_WINDOWPOS_UNDEFINED,SDL_WINDOWPOS_UNDEFINED, | |
+ sdl_window = SDL_CreateWindow("", SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, | |
x,y, ((fs&1)?SDL_WINDOW_FULLSCREEN:0)); | |
if (!sdl_window) | |
{ | |
Index: build/Makefile | |
=================================================================== | |
--- build/Makefile (revision 3893) | |
+++ build/Makefile (working copy) | |
@@ -64,7 +64,6 @@ | |
$(OBJ)/defs.$o \ | |
$(OBJ)/engine.$o \ | |
$(OBJ)/polymost.$o \ | |
- $(OBJ)/texcache.$o \ | |
$(OBJ)/dxtfilter.$o \ | |
$(OBJ)/hightile.$o \ | |
$(OBJ)/textfont.$o \ | |
@@ -79,6 +78,7 @@ | |
ifeq (1,$(USE_OPENGL)) | |
ENGINEOBJS+= $(OBJ)/mdsprite.$o | |
ENGINEOBJS+= $(OBJ)/glbuild.$o | |
+ ENGINEOBJS+= $(OBJ)/texcache.$o | |
endif | |
ifeq (1,$(POLYMER)) | |
Index: Makefile.common | |
=================================================================== | |
--- Makefile.common (revision 3893) | |
+++ Makefile.common (working copy) | |
@@ -128,9 +128,9 @@ | |
# NOASM - disables the use of inline assembly pragmas | |
# LINKED_GTK - enables compile-time linkage to GTK | |
# | |
-POLYMER = 1 | |
-USE_OPENGL = 1 | |
-NOASM = 0 | |
+POLYMER ?= 1 | |
+USE_OPENGL ?= 1 | |
+NOASM ?= 0 | |
LINKED_GTK = 0 | |
BUILD32_ON_64 ?= 0 | |
# DO NOT SET THIS TO 1 AND COMMIT IT. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
## build script for eduke32 on Linux (ODROID) | |
## @author neagix | |
# | |
export CFLAGS='-marm -mcpu=cortex-a9 -mtune=cortex-a9 -mfpu=neon -mfloat-abi=hard' | |
export CXXFLAGS='-marm -mcpu=cortex-a9 -mtune=cortex-a9 -mfpu=neon -mfloat-abi=hard' | |
export ASFLAGS='-marm -mcpu=cortex-a9 -mtune=cortex-a9 -mfpu=neon -mfloat-abi=hard' | |
USE_OPENGL=0 POLYMER=0 NOASM=1 WITHOUT_GTK=1 LINKED_GTK=0 USE_LIBVPX=0 make -j5 eduke32 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment