mirror of
https://github.com/libretro/bsnes-libretro.git
synced 2024-11-27 02:50:32 +00:00
Merge pull request #33 from JoeOsborn/fix-emscripten
use emar instead of em++/emcc for archiving
This commit is contained in:
commit
b8fbf6ca07
6
Makefile
6
Makefile
@ -363,6 +363,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)
|
||||
@ -491,9 +493,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)
|
||||
|
Loading…
Reference in New Issue
Block a user