mirror of
https://github.com/libretro/bsnes-libretro.git
synced 2025-02-17 00:38:06 +00:00
use emar instead of em++/emcc for archiving
This commit is contained in:
parent
dce703f241
commit
edc5010977
6
Makefile
6
Makefile
@ -363,6 +363,8 @@ else ifneq (,$(findstring windows_msvc2017,$(platform)))
|
|||||||
else ifeq ($(platform), emscripten)
|
else ifeq ($(platform), emscripten)
|
||||||
TARGET := $(TARGET_NAME)_libretro_$(platform).bc
|
TARGET := $(TARGET_NAME)_libretro_$(platform).bc
|
||||||
STATIC_LINKING = 1
|
STATIC_LINKING = 1
|
||||||
|
CFLAGS += -D__linux__
|
||||||
|
CXXFLAGS += -D__linux__
|
||||||
|
|
||||||
# Windows MSVC 2005 x86
|
# Windows MSVC 2005 x86
|
||||||
else ifeq ($(platform), windows_msvc2005_x86)
|
else ifeq ($(platform), windows_msvc2005_x86)
|
||||||
@ -491,9 +493,7 @@ else
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
$(TARGET): $(OBJECTS)
|
$(TARGET): $(OBJECTS)
|
||||||
ifeq ($(platform), emscripten)
|
ifeq ($(STATIC_LINKING), 1)
|
||||||
$(CXX) $(CXXFLAGS) $(OBJOUT)$@ $^
|
|
||||||
else ifeq ($(STATIC_LINKING), 1)
|
|
||||||
$(AR) rcs $@ $(OBJECTS)
|
$(AR) rcs $@ $(OBJECTS)
|
||||||
else
|
else
|
||||||
$(LD) $(LINKOUT)$@ $^ $(LDFLAGS) $(LIBS)
|
$(LD) $(LINKOUT)$@ $^ $(LDFLAGS) $(LIBS)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user