Skip to content

NSW: dynamic cores #117

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
misson20000 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

NSW: dynamic cores #117

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
16 changes: 9 additions & 7 deletions Makefile.libretro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,11 +375,10 @@ else ifeq ($(platform), msvc)

# Nintendo Switch (libtransistor)
else ifeq ($(platform), switch)
EXT=a
TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
include $(LIBTRANSISTOR_HOME)/libtransistor.mk
STATIC_LINKING=1
STATIC_LINKING_LINK=1
EXT=so
TARGET := $(TARGET_NAME)_libretro_$(platform).$(EXT)
include $(LIBTRANSISTOR_HOME)/libtransistor.mk
LDFLAGS = $(LD_SHARED_LIBRARY_FLAGS) -ltransistor.lib.nro $(LIBTRANSISTOR_LIB_LDFLAGS) -E

# Windows MSVC 2003 Xbox 1
else ifeq ($(platform), xbox1_msvc2003)
Expand Down Expand Up @@ -457,9 +456,11 @@ ifeq ($(STATIC_LINKING),1)
else
LD = link.exe
endif
else ifeq ($(platform), switch)
# libtransistor.mk sets LD for us
else
OBJOUT = -o
LINKOUT = -o
LINKOUT = -o
LD = $(CC)
endif

Expand All @@ -481,7 +482,8 @@ else
$(AR) rcs $@ $(OBJECTS)
endif
else
$(CC) $(fpic) $(SHARED) $(INCFLAGS) $(LDFLAGS) $(OBJOUT)$@ $(OBJECTS) $(LIBM)
echo ld $(LD)
$(LD) $(fpic) $(SHARED) $(LDFLAGS) $(OBJOUT)$@ $(OBJECTS) $(LIBM)
endif

%.o: %.c
Expand Down