zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

OSX build: don't include startup window (where the hell is the nib file?); makefile bits for libpng from maxports (dynamically linked, not enabled); update osxbuild.sh so that the 64-bit build links (statically) to libvpx

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@2076 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2011-10-11 16:53:52 +00:00
parent 5b369505f1
commit d540f18ef4
5 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/eduke32/Makefile.common
View file

@ -23,8 +23,8 @@ LINKED_GTK = 0
BUILD32_ON_64 ?= 0 BUILD32_ON_64 ?= 0
# DO NOT SET THIS TO 1 AND COMMIT IT. # DO NOT SET THIS TO 1 AND COMMIT IT.
NEDMALLOC = 0 NEDMALLOC = 0
USE_LIBPNG = 0 USE_LIBPNG ?= 0
USE_LIBVPX = 1 USE_LIBVPX ?= 1
ifeq (0,$(USE_OPENGL)) ifeq (0,$(USE_OPENGL))
POLYMER = 0 POLYMER = 0

13
polymer/eduke32/build/Makefile
View file

@ -65,6 +65,12 @@ endif
ifneq ($(PLATFORM),WINDOWS) ifneq ($(PLATFORM),WINDOWS)
LIBS+= -ldl -pthread LIBS+= -ldl -pthread
endif endif
ifeq ($(PLATFORM),DARWIN)
ifneq ($(USE_LIBPNG),0)
OURCFLAGS+= -I/opt/local/include
LIBS+= -L/opt/local/lib -lpng
endif
endif
ENGINEOBJS+= \ ENGINEOBJS+= \
@ -109,12 +115,11 @@ ifeq ($(PLATFORM),LINUX)
endif endif
ifeq ($(PLATFORM),DARWIN) ifeq ($(PLATFORM),DARWIN)
ifneq ($(findstring ppc,$(ARCH)),ppc) ifneq ($(findstring ppc,$(ARCH)),ppc)
ENGINEOBJS += $(OBJ)/StartupWinController.editor.$o # ENGINEOBJS += $(OBJ)/StartupWinController.editor.$o
endif endif
ENGINEOBJS += $(OBJ)/osxbits.$o ENGINEOBJS += $(OBJ)/osxbits.$o
ASFLAGS += -DUNDERSCORES -f macho ASFLAGS += -f macho -DUNDERSCORES
OURCFLAGS += -DUNDERSCORES -fno-pic OURCFLAGS += -fno-pic -DUNDERSCORES
TARGETOPTS += -DNOASM
endif endif
ifeq ($(PLATFORM),BSD) ifeq ($(PLATFORM),BSD)
ASFLAGS+= -f elf ASFLAGS+= -f elf

4
polymer/eduke32/build/Makefile.shared
View file

@ -94,16 +94,16 @@ ifeq ($(PLATFORM),LINUX)
endif endif
ifeq ($(PLATFORM),DARWIN) ifeq ($(PLATFORM),DARWIN)
RENDERTYPE = SDL RENDERTYPE = SDL
BUILDCFLAGS += -DHAVE_INTTYPES BUILDCFLAGS += -DHAVE_INTTYPES #-fno-leading-underscore
GTKCOMPAT32 = 0 GTKCOMPAT32 = 0
SDL_FRAMEWORK = 1 SDL_FRAMEWORK = 1
ifeq (1,$(BUILD32_ON_64)) ifeq (1,$(BUILD32_ON_64))
BUILDCFLAGS += $(F_NO_STACK_PROTECTOR) -arch i386 BUILDCFLAGS += $(F_NO_STACK_PROTECTOR) -arch i386
else else
# ASM won't work on PowerPC or x86_64
ifeq ($(findstring ppc,$(ARCH)),ppc) ifeq ($(findstring ppc,$(ARCH)),ppc)
BUILDCFLAGS += $(F_NO_STACK_PROTECTOR) BUILDCFLAGS += $(F_NO_STACK_PROTECTOR)
endif endif
# ASM won't work on PowerPC or x86_64
override NOASM = 1 override NOASM = 1
endif endif
endif endif

2
polymer/eduke32/build/src/sdlayer.c
View file

@ -31,7 +31,7 @@
# include "gtkbits.h" # include "gtkbits.h"
#endif #endif
#if (!defined __APPLE__ && !defined HAVE_GTK2) || (defined __APPLE__ && defined __BIG_ENDIAN__) #if (!defined __APPLE__ && !defined HAVE_GTK2) || (defined __APPLE__) // && defined __BIG_ENDIAN__)
int32_t startwin_open(void) { return 0; } int32_t startwin_open(void) { return 0; }
int32_t startwin_close(void) { return 0; } int32_t startwin_close(void) { return 0; }
int32_t startwin_puts(const char *s) { s=s; return 0; } int32_t startwin_puts(const char *s) { s=s; return 0; }

6
polymer/eduke32/osxbuild.sh
View file

@ -30,7 +30,7 @@ if [ $onlyzip -eq 0 ]; then
# fi # fi
make veryclean make veryclean
WITHOUT_GTK=1 RELEASE=1 BUILD32_ON_64=0 make -j 3 WITHOUT_GTK=1 RELEASE=1 BUILD32_ON_64=0 USE_LIBVPX=1 make -j 3
if [ $? ]; then if [ $? ]; then
echo 64-bit release build succeeded. echo 64-bit release build succeeded.
cp mapster32 mapster32.x64 cp mapster32 mapster32.x64
@ -50,7 +50,7 @@ if [ $onlyzip -eq 0 ]; then
# fi # fi
make veryclean make veryclean
WITHOUT_GTK=1 RELEASE=1 BUILD32_ON_64=1 make -j 3 WITHOUT_GTK=1 RELEASE=1 BUILD32_ON_64=1 USE_LIBVPX=0 make -j 3
if [ $? ]; then if [ $? ]; then
echo 32-bit release build succeeded. echo 32-bit release build succeeded.
cp mapster32 mapster32.x86 cp mapster32 mapster32.x86
@ -70,7 +70,7 @@ if [ $onlyzip -eq 0 ]; then
# fi # fi
make veryclean make veryclean
ARCH='-arch ppc' WITHOUT_GTK=1 RELEASE=1 BUILD32_ON_64=0 make -j 3 ARCH='-arch ppc' WITHOUT_GTK=1 RELEASE=1 BUILD32_ON_64=0 USE_LIBVPX=0 make -j 3
if [ $? ]; then if [ $? ]; then
echo PowerPC release build succeeded. echo PowerPC release build succeeded.
cp mapster32 mapster32.ppc cp mapster32 mapster32.ppc