Skip to content

Add webOS cross-compilation support, make openmp optional #141

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cscd98 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add webOS cross-compilation support, make openmp optional #141

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion bsnes/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
target ?= bsnes
binary ?= application
build := performance
openmp := true
openmp ?= true
local := false
flags += -I. -I..

Expand Down
14 changes: 10 additions & 4 deletions bsnes/target-libretro/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
name := bsnes_libretro
local := false
openmp := true
openmp ?= true
flags += -Wno-narrowing -Wno-multichar -g -fPIC

ifeq ($(openmp),true)
openmp_libs := -lgomp
else
openmp_libs :=
endif

ifeq ($(platform), ios-arm64)
flags += -fPIC -miphoneos-version-min=11.0 -Wno-error=implicit-function-declaration -DHAVE_POSIX_MEMALIGN
options += -dynamiclib
Expand All @@ -22,10 +28,10 @@ objects := $(patsubst %,obj/%.o,$(objects))
obj/libretro.o: target-libretro/libretro.cpp

all: $(objects)
ifeq ($(platform),linux)
$(strip $(compiler) -o out/bsnes_hd_beta_libretro.so -shared $(objects) -Wl,--no-undefined -Wl,--version-script=target-libretro/link.T -lgomp -Wl,-Bdynamic $(options))
ifneq ($(filter $(platform),linux unix),)
$(strip $(compiler) -o out/bsnes_hd_beta_libretro.so -shared $(objects) -Wl,--no-undefined -Wl,--version-script=target-libretro/link.T $(openmp_libs) -Wl,-Bdynamic $(options))
else ifeq ($(platform),windows)
$(strip $(compiler) -o out/bsnes_hd_beta_libretro.dll -shared $(objects) -Wl,--no-undefined -Wl,--version-script=target-libretro/link.T -lgomp -Wl,-Bdynamic $(options))
$(strip $(compiler) -o out/bsnes_hd_beta_libretro.dll -shared $(objects) -Wl,--no-undefined -Wl,--version-script=target-libretro/link.T $(openmp_libs) -Wl,-Bdynamic $(options))
else ifeq ($(platform),libnx)
$(strip $(AR) rcs out/bsnes_hd_beta_libretro_libnx.a $(objects))
else ifeq ($(platform),macos)
Expand Down
7 changes: 7 additions & 0 deletions nall/GNUmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,13 @@ ifeq ($(compiler),)
endif
endif

# cross compilation
ifneq (,$(findstring webos,$(CROSS_COMPILE)))
ifeq (,$(wildcard $(STAGING_DIR)/usr/lib/libgomp.so))
openmp = false
endif
endif

# build optimization levels
ifeq ($(build),debug)
flags += -Og -g -DBUILD_DEBUG
Expand Down