Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ engine/resources/OpenBOR.res
tools/bin/.wget-hsts
tools/win-sdk/*
!tools/win-sdk/win-sdk.7z
tools/psp-sdk/*
/openbor_vs
engine/ios/Build
**/.DS_Store
tools/borpak/source/borpak
build/
116 changes: 0 additions & 116 deletions engine/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -308,33 +308,6 @@ SOURCE = source/stringptr.o
source/omath.o



ifdef BUILD_PSP
GAME_CONSOLE = psp/control/control.o \
psp/dvemgr/dvemgr.o \
psp/kernel/kernel.o \
psp/graphics.o \
psp/audiodrv.o \
psp/sblaster.o \
psp/control.o \
psp/vertex.o \
psp/timer.o \
psp/video.o \
psp/image.o \
psp/menu.o \
psp/pspport.o
endif

ifdef BUILD_VITA
GAME_CONSOLE = vita/control.o \
vita/sblaster.o \
vita/timer.o \
vita/video.o \
vita/vitaport.o \
vita/menu.o
endif


ifdef BUILD_SDL
GAME += source/gamelib/filters.o
endif
Expand Down Expand Up @@ -418,12 +391,6 @@ CFLAGS += -DNO_RAM_DEBUGGER
endif
endif


ifdef BUILD_PSP
CFLAGS += -G0
endif


ifdef BUILD_SDL
CFLAGS += -DSDL=1
endif
Expand All @@ -438,10 +405,6 @@ ifdef BUILD_PANDORA
CFLAGS += -DLINUX
endif

ifdef BUILD_VITA
CFLAGS += -DCACHE_BACKGROUNDS -Wl,-q
endif


ifdef BUILD_MMX
CFLAGS += -DMMX
Expand Down Expand Up @@ -492,12 +455,6 @@ ASFLAGS = $(CFLAGS)

LIBS = $(addprefix -L", $(addsuffix ", $(LIBRARIES)))


ifdef BUILD_PSP
LIBS += -lpspgu -lpspaudio -lpsppower -lpsprtc
endif


ifdef BUILD_DARWIN
LIBS += -Wl,-syslibroot,$(SDKPATH) \
-framework Cocoa \
Expand Down Expand Up @@ -534,12 +491,6 @@ ifdef BUILD_PTHREAD
LIBS += -lpthread
endif

ifdef BUILD_VITA
LIBS += -lvita2d -lSceKernel_stub -lSceDisplay_stub -lSceGxm_stub \
-lSceSysmodule_stub -lSceCtrl_stub -lScePgf_stub \
-lSceCommonDialog_stub -lSceAudio_stub -lfreetype -ljpeg
endif


ifdef BUILD_STATIC
LIBS += -static
Expand All @@ -566,29 +517,6 @@ endif

LIBS += -lpng -lz -lm

#----------------------------------------------------------------------------------------------------
# Rules to manage Files and Libraries for PSP
#----------------------------------------------------------------------------------------------------

ifdef BUILD_PSP
%.o : %.c
@echo Compiling $(TARGET_PLATFORM) Port: $<...
@$(CC) $(CFLAGS) -c $< -o $@
%.o : %.S
@echo Compiling $(TARGET_PLATFORM) Port: $<...
@$(CC) $(CFLAGS) -c $< -o $@
INCDIR = $(INCS)
PSP_EBOOT_TITLE = $(VERSION_NAME) $(VERSION)
PSP_EBOOT_ICON = resources/OpenBOR_Icon_144x80.png
PSP_EBOOT_PIC1 = resources/OpenBOR_Logo_480x272.png
PSP_FW_VERSION = 371
PSP_LARGE_MEMORY= 1
BUILD_PRX = 1
include psp/build.mak
endif



#----------------------------------------------------------------------------------------------------
# Rules to manage Files and Libraries for SDL
#----------------------------------------------------------------------------------------------------
Expand All @@ -614,34 +542,6 @@ $(TARGET_FINAL) : $(TARGET)
@echo $(TARGET_FINAL) is now ready!
endif

#----------------------------------------------------------------------------------------------------
# Rules to manage Files and Libraries for Vita
#----------------------------------------------------------------------------------------------------

ifdef BUILD_VITA
all : OpenBOR.vpk
@echo
%.o : %.c
@echo Compiling $(TARGET_PLATFORM) Port: $<...
@$(CC) $(CFLAGS) -c $< -o $@
OpenBOR.elf : $(OBJS) $(RES)
@echo
@echo Linking $(TARGET_PLATFORM) Port: $(TARGET)...
@$(CC) $(CFLAGS) -o $(TARGET) $(OBJS) $(TARGET_RESOURCE) $(LIBS)
%.velf: %.elf
vita-elf-create $< $@
eboot.bin: $(VERSION_NAME).velf
vita-make-fself -s $< $@
OpenBOR.vpk: eboot.bin
@echo Stripping $(TARGET_PLATFORM) Port: $(TARGET_FINAL)...
vita-mksfoex -s TITLE_ID=$(TITLE_ID) "OpenBOR" param.sfo
vita-pack-vpk -s param.sfo -b eboot.bin --add resources/vita_icon.png=sce_sys/icon0.png $@
@echo
@echo Completed $(TARGET_PLATFORM) Port!
@echo $(TARGET_FINAL) is now ready!
endif


#----------------------------------------------------------------------------------------------------
# Rules to CleanUp Files for All Platforms
#----------------------------------------------------------------------------------------------------
Expand All @@ -651,7 +551,6 @@ all:
@echo
@echo Build A TARGET_PLATFORM:
@echo
@echo make BUILD_PSP=1
@echo make BUILD_PS2=1
@echo make BUILD_WIN=1
@echo make BUILD_PANDORA=1
Expand All @@ -667,21 +566,6 @@ all:
@echo
endif


ifndef BUILD_PSP
clean-all: clean-releases clean

clean-releases:
@if [ -d ./releases ]; then rm -rf ./releases; fi

clean:
@echo
@echo "Removing All $(TARGET_PLATFORM) Files..."
@rm -f $(TARGET) $(TARGET_FINAL) $(TARGET_MAP) PARAM.SFO param.sfo eboot.bin OpenBOR.velf linkmap $(OBJS)
@echo Done!
@echo
endif

version:
@echo "-------------------------------------------------------"
@echo "OpenBOR $(VERSION) - https://www.ChronoCrash.com"
Expand Down
2 changes: 1 addition & 1 deletion engine/android/app/jni/openbor/include/sdl/SDL_hints.h
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ extern "C" {
* Use this hint in case you need to set SDL's threads stack size to other than the default.
* This is specially useful if you build SDL against a non glibc libc library (such as musl) which
* provides a relatively small default thread stack size (a few kilobytes versus the default 8MB glibc uses).
* Support for this hint is currently available only in the pthread, Windows, and PSP backend.
* Support for this hint is currently available only in the pthread, and Windows.
*
* Instead of this hint, in 2.0.9 and later, you can use
* SDL_CreateThreadWithStackSize(). This hint only works with the classic
Expand Down
4 changes: 0 additions & 4 deletions engine/android/app/jni/openbor/include/sdl/SDL_platform.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@
#undef __BSDI__
#define __BSDI__ 1
#endif
#if defined(_arch_dreamcast)
#undef __DREAMCAST__
#define __DREAMCAST__ 1
#endif
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
#undef __FREEBSD__
#define __FREEBSD__ 1
Expand Down
2 changes: 0 additions & 2 deletions engine/build.bat
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,10 @@ bash.exe build.sh all

@setlocal
@echo off
@if not exist "%CD%\releases\PSP\OpenBOR\EBOOT.PBP" goto missing
@if not exist "%CD%\releases\WINDOWS\OpenBOR\OpenBOR.exe" goto missing

set TOOLS=../tools/bin;../tools/7-Zip;../tools/svn/bin
set PATH=%TOOLS%;%PATH%
call xbox/make.bat
bash.exe version.sh 1
:missing
@endlocal
Expand Down
Loading
Loading