Skip to content

Commit

Permalink
Merge pull request #137 from JoeOsborn/fix-emscripten
Browse files Browse the repository at this point in the history
use emar instead of em++ for archiving
  • Loading branch information
LibretroAdmin authored Nov 1, 2023
2 parents 733b294 + 69c64e7 commit 9eb9dca
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -538,9 +538,7 @@ OBJECTS := $(SOURCES_CXX:.cpp=.o) $(SOURCES_C:.c=.o)

all: $(TARGET)
$(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)
Expand Down

0 comments on commit 9eb9dca

Please sign in to comment.