Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ladislav-zezula/StormLib
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: Wargus/StormLib
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Apr 22, 2019

  1. drop ranlib argument

    @timfel
    timfel committed Apr 22, 2019
    Copy the full SHA
    e6108bb View commit details

  2. build static library on mac

    @timfel
    timfel committed Apr 22, 2019
    Copy the full SHA
    e1a40f0 View commit details
Showing with 6 additions and 2 deletions.
  1. +1 −1 Makefile.linux
  2. +5 −1 Makefile.mac
2 changes: 1 addition & 1 deletion Makefile.linux
View file
Original file line number Diff line number Diff line change
@@ -287,7 +287,7 @@ $(COBJS): %.o: %.c
$(LIB): $(OBJS) $(COBJS)

all: $(LIB)
ranlib -c $(SLIB)
ranlib $(SLIB)

install: $(LIB)
install $(LIB) /usr/local/lib
6 changes: 5 additions & 1 deletion Makefile.mac
View file
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@ AR = ar
ARFLAGS= rcs

LIBRARY = libStorm.dylib
SLIB = libStorm.a

OBJS = src/adpcm/adpcm.o \
src/huffman/huff.o \
@@ -255,7 +256,7 @@ COBJS = src/libtomcrypt/src/hashes/sha1.o \
src/lzma/C/LzmaDec.o \
src/jenkins/lookup3.o

all: $(LIBRARY)
all: $(LIBRARY) $(SLIB)

#clean:
# rm -f $(OBJS) $(LIBRARY)
@@ -266,6 +267,9 @@ all: $(LIBRARY)
# cp src/StormLib.h /usr/local/include/StormLib
# cp src/StormPort.h /usr/local/include/StormLib

$(SLIB): $(COBJS) $(OBJS)
$(AR) $(ARFLAGS) $(SLIB) $(COBJS) $(OBJS)

$(LIBRARY): $(COBJS) $(OBJS)
$(CPP) $(CFLAGS) $(DFLAGS) $(ARCH) $(LFLAGS) -shared -o $(LIBRARY) $(COBJS) $(OBJS)
# $(AR) $(ARFLAGS) $(LIBRARY) $(COBJS) $(OBJS)