added ranlib when library is created with ar.
Этот коммит содержится в:
родитель
d44e222b75
Коммит
d45d509a09
@ -107,8 +107,9 @@ LDFLAGS = -T
|
|||||||
AR = ar
|
AR = ar
|
||||||
ARFLAGS = -cq
|
ARFLAGS = -cq
|
||||||
LIBEXT = a
|
LIBEXT = a
|
||||||
|
RANLIB = ranlib
|
||||||
CFLAGS += -fno-builtin -fpcc-struct-return -fno-strict-aliasing
|
CFLAGS += -fno-builtin -fpcc-struct-return -fno-strict-aliasing
|
||||||
CFLAGS += -Wall -Wno-unused # -pedantic
|
CFLAGS += -Wall # -pedantic
|
||||||
#CFLAGS += -Wno-pointer-sign
|
#CFLAGS += -Wno-pointer-sign
|
||||||
ifeq ($(LIBARCH),LIBC)
|
ifeq ($(LIBARCH),LIBC)
|
||||||
PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o
|
PRELUDE = $(SDK_LIBC)/imports/libcpre.gcc.o
|
||||||
@ -268,6 +269,9 @@ $(TARGET).$(LIBEXT): $(OBJS)
|
|||||||
@echo Creating $@
|
@echo Creating $@
|
||||||
@-$(RM) $@
|
@-$(RM) $@
|
||||||
@$(AR) $(ARFLAGS) $@ $^
|
@$(AR) $(ARFLAGS) $@ $^
|
||||||
|
ifdef RANLIB
|
||||||
|
@$(RANLIB) $@
|
||||||
|
endif
|
||||||
|
|
||||||
$(TARGET).nlm: $(OBJDIR)/$(TARGET).def $(TARGET).imp $(OBJL) $(XDCDATA)
|
$(TARGET).nlm: $(OBJDIR)/$(TARGET).def $(TARGET).imp $(OBJL) $(XDCDATA)
|
||||||
@echo Linking $@
|
@echo Linking $@
|
||||||
|
@ -73,6 +73,7 @@ LDFLAGS = -nostdlib
|
|||||||
AR = $(LD)
|
AR = $(LD)
|
||||||
ARFLAGS = -type library -w nocmdline $(OBJS) -o
|
ARFLAGS = -type library -w nocmdline $(OBJS) -o
|
||||||
LIBEXT = lib
|
LIBEXT = lib
|
||||||
|
#RANLIB =
|
||||||
LIBPATH += -lr "$(METROWERKS)/MSL" -lr "$(METROWERKS)/Win32-x86 Support"
|
LIBPATH += -lr "$(METROWERKS)/MSL" -lr "$(METROWERKS)/Win32-x86 Support"
|
||||||
LDLIBS += -lMSL_Runtime_x86.lib -lMSL_C_x86.lib -lMSL_Extras_x86.lib
|
LDLIBS += -lMSL_Runtime_x86.lib -lMSL_C_x86.lib -lMSL_Extras_x86.lib
|
||||||
LDLIBS += -lkernel32.lib -luser32.lib -lwsock32.lib
|
LDLIBS += -lkernel32.lib -luser32.lib -lwsock32.lib
|
||||||
@ -87,10 +88,12 @@ LDFLAGS = -s -shared -Wl,--out-implib,$(TARGET)dll.a
|
|||||||
AR = ar
|
AR = ar
|
||||||
ARFLAGS = -cq
|
ARFLAGS = -cq
|
||||||
LIBEXT = a
|
LIBEXT = a
|
||||||
|
RANLIB = ranlib
|
||||||
#LDLIBS += -lwsock32
|
#LDLIBS += -lwsock32
|
||||||
LDLIBS += -lws2_32
|
LDLIBS += -lws2_32
|
||||||
RCFLAGS = -O coff -i
|
RCFLAGS = -O coff -i
|
||||||
CFLAGS += -fno-strict-aliasing -Wall -Wno-unused # -pedantic
|
CFLAGS += -fno-strict-aliasing
|
||||||
|
CFLAGS += -Wall # -pedantic
|
||||||
endif
|
endif
|
||||||
|
|
||||||
INCLUDES = -I. -I../include
|
INCLUDES = -I. -I../include
|
||||||
@ -214,6 +217,9 @@ $(TARGET).$(LIBEXT): $(OBJS)
|
|||||||
@echo Creating $@
|
@echo Creating $@
|
||||||
@-$(RM) $@
|
@-$(RM) $@
|
||||||
@$(AR) $(ARFLAGS) $@ $^
|
@$(AR) $(ARFLAGS) $@ $^
|
||||||
|
ifdef RANLIB
|
||||||
|
@$(RANLIB) $@
|
||||||
|
endif
|
||||||
|
|
||||||
$(TARGET).dll $(TARGET)dll.a: $(OBJL)
|
$(TARGET).dll $(TARGET)dll.a: $(OBJL)
|
||||||
@echo Linking $@
|
@echo Linking $@
|
||||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user