Merge branch 'fix-soname2' of https://github.com/JonathonReinhart/unicorn
This commit is contained in:
commit
be36122d0c
2
.gitignore
vendored
2
.gitignore
vendored
@ -4,6 +4,8 @@
|
|||||||
*.o
|
*.o
|
||||||
*.a
|
*.a
|
||||||
*.dSYM
|
*.dSYM
|
||||||
|
*.so
|
||||||
|
*.so.*
|
||||||
|
|
||||||
qemu/config-all-devices.mak
|
qemu/config-all-devices.mak
|
||||||
|
|
||||||
|
7
Makefile
7
Makefile
@ -131,7 +131,8 @@ LIBRARY = $(BLDIR)/$(LIBNAME).$(EXT)
|
|||||||
else ifeq ($(IS_CYGWIN),1)
|
else ifeq ($(IS_CYGWIN),1)
|
||||||
LIBRARY = $(BLDIR)/$(LIBNAME).$(EXT)
|
LIBRARY = $(BLDIR)/$(LIBNAME).$(EXT)
|
||||||
else # *nix
|
else # *nix
|
||||||
LIBRARY = $(BLDIR)/lib$(LIBNAME).$(EXT)
|
LIBRARY = $(BLDIR)/lib$(LIBNAME).$(VERSION_EXT)
|
||||||
|
LIBRARY_SYMLINK = $(BLDIR)/lib$(LIBNAME).$(EXT)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
@ -229,6 +230,9 @@ ifeq ($(V),0)
|
|||||||
else
|
else
|
||||||
$(CC) $(CFLAGS) $($(LIBNAME)_LDFLAGS) -shared $^ -o $(LIBRARY) $(GLIB) -lm
|
$(CC) $(CFLAGS) $($(LIBNAME)_LDFLAGS) -shared $^ -o $(LIBRARY) $(GLIB) -lm
|
||||||
endif
|
endif
|
||||||
|
ifneq (,$(LIBRARY_SYMLINK))
|
||||||
|
@ln -sf $(LIBRARY) $(LIBRARY_SYMLINK)
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
$(ARCHIVE): $(UC_TARGET_OBJ) uc.o hook.o
|
$(ARCHIVE): $(UC_TARGET_OBJ) uc.o hook.o
|
||||||
@ -262,7 +266,6 @@ ifeq ($(UNICORN_SHARED),yes)
|
|||||||
$(INSTALL_LIB) $(LIBRARY) $(LIBDIR)
|
$(INSTALL_LIB) $(LIBRARY) $(LIBDIR)
|
||||||
ifneq ($(VERSION_EXT),)
|
ifneq ($(VERSION_EXT),)
|
||||||
cd $(LIBDIR) && \
|
cd $(LIBDIR) && \
|
||||||
mv lib$(LIBNAME).$(EXT) lib$(LIBNAME).$(VERSION_EXT) && \
|
|
||||||
ln -s lib$(LIBNAME).$(VERSION_EXT) lib$(LIBNAME).$(EXT)
|
ln -s lib$(LIBNAME).$(VERSION_EXT) lib$(LIBNAME).$(EXT)
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user