Mirrors
/
libretro-bsnes-mercury
mirror of https://github.com/libretro/bsnes-mercury.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #99 from JoeOsborn/fix-emscripten 

use emar instead of em++/emcc for archive file
master
LibretroAdmin 2023-11-01 05:47:26 +01:00 committed by GitHub
parent fb9a41fe9b 38b799b82c
commit 60c204ca17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -413,6 +413,8 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
else ifeq ($(platform), emscripten)
TARGET := $(TARGET_NAME)_libretro_$(platform).bc
STATIC_LINKING = 1
CFLAGS += -D__linux__
CXXFLAGS += -D__linux__
# Windows MSVC 2005 x86
else ifeq ($(platform), windows_msvc2005_x86)
@ -548,9 +550,7 @@ else
endif
$(TARGET): $(OBJECTS)
ifeq ($(platform), emscripten)
$(CXX) $(CXXFLAGS) $(OBJOUT)$@ $^
else ifeq ($(STATIC_LINKING), 1)
ifeq ($(STATIC_LINKING), 1)
$(AR) rcs $@ $(OBJECTS)
else
$(LD) $(LINKOUT)$@ $^ $(LDFLAGS) $(LIBS)