mirror of
https://github.com/KolibriOS/kolibrios.git
synced 2024-12-24 23:56:49 +03:00
sdk: update builds on linux hosts
git-svn-id: svn://kolibrios.org@6303 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Sergey Semyonov (Serge)
parent
96876d8cc7
commit
8982c8cd10
File diff suppressed because it is too large
Load Diff
@ -1,116 +0,0 @@
|
||||
include $(SRC_PATH)/common.mak
|
||||
|
||||
LIBVERSION := $(lib$(NAME)_VERSION)
|
||||
LIBMAJOR := $(lib$(NAME)_VERSION_MAJOR)
|
||||
LIBMINOR := $(lib$(NAME)_VERSION_MINOR)
|
||||
INCINSTDIR := $(INCDIR)/lib$(NAME)
|
||||
|
||||
INSTHEADERS := $(INSTHEADERS) $(HEADERS:%=$(SUBDIR)%)
|
||||
|
||||
all-$(CONFIG_STATIC): $(SUBDIR)$(LIBNAME)
|
||||
all-$(CONFIG_SHARED): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
|
||||
|
||||
$(SUBDIR)%-test.o: $(SUBDIR)%-test.c
|
||||
$(COMPILE_C)
|
||||
|
||||
$(SUBDIR)%-test.o: $(SUBDIR)%.c
|
||||
$(COMPILE_C)
|
||||
|
||||
$(SUBDIR)%-test.i: $(SUBDIR)%-test.c
|
||||
$(CC) $(CCFLAGS) $(CC_E) $<
|
||||
|
||||
$(SUBDIR)%-test.i: $(SUBDIR)%.c
|
||||
$(CC) $(CCFLAGS) $(CC_E) $<
|
||||
|
||||
$(SUBDIR)x86/%.o: $(SUBDIR)x86/%.asm
|
||||
$(DEPYASM) $(YASMFLAGS) -I $(<D)/ -M -o $@ $< > $(@:.o=.d)
|
||||
$(YASM) $(YASMFLAGS) -I $(<D)/ -o $@ $<
|
||||
-$(STRIP) -wN '..@*' $@
|
||||
|
||||
LIBOBJS := $(OBJS) $(SUBDIR)%.h.o $(TESTOBJS)
|
||||
$(LIBOBJS) $(LIBOBJS:.o=.s) $(LIBOBJS:.o=.i): CPPFLAGS += -DHAVE_AV_CONFIG_H
|
||||
$(TESTOBJS) $(TESTOBJS:.o=.i): CPPFLAGS += -DTEST
|
||||
|
||||
$(SUBDIR)$(LIBNAME): $(OBJS)
|
||||
$(RM) $@
|
||||
$(AR) $(ARFLAGS) $(AR_O) $^
|
||||
|
||||
install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig
|
||||
|
||||
install-libs-$(CONFIG_STATIC): install-lib$(NAME)-static
|
||||
install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared
|
||||
|
||||
define RULES
|
||||
$(EXAMPLES) $(TOOLS): THISLIB = $(FULLNAME:%=$(LD_LIB))
|
||||
$(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME)
|
||||
|
||||
$(EXAMPLES) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
|
||||
$$(LD) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS)
|
||||
|
||||
$(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR)
|
||||
# $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
|
||||
|
||||
$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(OBJS) $(SUBDIR)lib$(NAME).ver
|
||||
$(SLIB_CREATE_DEF_CMD)
|
||||
$$(LD) $(SHFLAGS) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $(FFEXTRALIBS)
|
||||
$(SLIB_EXTRA_CMD)
|
||||
$(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)
|
||||
cd ..
|
||||
mv -f $(SUBDIR)$(SLIBNAME_WITH_MAJOR) ../../bin
|
||||
mv -f $(SUBDIR)lib$(SLIBNAME).a ../../lib
|
||||
|
||||
|
||||
ifdef SUBDIR
|
||||
$(SUBDIR)$(SLIBNAME_WITH_MAJOR): $(DEP_LIBS)
|
||||
endif
|
||||
|
||||
clean::
|
||||
$(RM) $(addprefix $(SUBDIR),*-example$(EXESUF) *-test$(EXESUF) $(CLEANFILES) $(CLEANSUFFIXES) $(LIBSUFFIXES)) \
|
||||
$(CLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%)
|
||||
|
||||
distclean:: clean
|
||||
$(RM) $(DISTCLEANSUFFIXES:%=$(SUBDIR)%) $(DISTCLEANSUFFIXES:%=$(SUBDIR)$(ARCH)/%)
|
||||
|
||||
install-lib$(NAME)-shared: $(SUBDIR)$(SLIBNAME)
|
||||
$(Q)mkdir -p "$(SHLIBDIR)"
|
||||
$$(INSTALL) -m 755 $$< "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)"
|
||||
$$(STRIP) "$(SHLIBDIR)/$(SLIB_INSTALL_NAME)"
|
||||
$(Q)$(foreach F,$(SLIB_INSTALL_LINKS),(cd "$(SHLIBDIR)" && $(LN_S) $(SLIB_INSTALL_NAME) $(F));)
|
||||
$(if $(SLIB_INSTALL_EXTRA_SHLIB),$$(INSTALL) -m 644 $(SLIB_INSTALL_EXTRA_SHLIB:%=$(SUBDIR)%) "$(SHLIBDIR)")
|
||||
$(if $(SLIB_INSTALL_EXTRA_LIB),$(Q)mkdir -p "$(LIBDIR)")
|
||||
$(if $(SLIB_INSTALL_EXTRA_LIB),$$(INSTALL) -m 644 $(SLIB_INSTALL_EXTRA_LIB:%=$(SUBDIR)%) "$(LIBDIR)")
|
||||
|
||||
install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
|
||||
$(Q)mkdir -p "$(LIBDIR)"
|
||||
$$(INSTALL) -m 644 $$< "$(LIBDIR)"
|
||||
$(LIB_INSTALL_EXTRA_CMD)
|
||||
|
||||
install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS))
|
||||
$(Q)mkdir -p "$(INCINSTDIR)"
|
||||
$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
|
||||
|
||||
install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(FULLNAME).pc
|
||||
$(Q)mkdir -p "$(LIBDIR)/pkgconfig"
|
||||
$$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
|
||||
|
||||
uninstall-libs::
|
||||
-$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \
|
||||
"$(SHLIBDIR)/$(SLIBNAME)" \
|
||||
"$(SHLIBDIR)/$(SLIBNAME_WITH_VERSION)"
|
||||
-$(RM) $(SLIB_INSTALL_EXTRA_SHLIB:%="$(SHLIBDIR)/%")
|
||||
-$(RM) $(SLIB_INSTALL_EXTRA_LIB:%="$(LIBDIR)/%")
|
||||
-$(RM) "$(LIBDIR)/$(LIBNAME)"
|
||||
|
||||
uninstall-headers::
|
||||
$(RM) $(addprefix "$(INCINSTDIR)/",$(HEADERS) $(BUILT_HEADERS))
|
||||
$(RM) "$(LIBDIR)/pkgconfig/lib$(FULLNAME).pc"
|
||||
-rmdir "$(INCINSTDIR)"
|
||||
endef
|
||||
|
||||
$(eval $(RULES))
|
||||
|
||||
$(EXAMPLES) $(TOOLS): $(DEP_LIBS) $(SUBDIR)$($(CONFIG_SHARED:yes=S)LIBNAME)
|
||||
$(TESTPROGS): $(DEP_LIBS) $(SUBDIR)$(LIBNAME)
|
||||
|
||||
examples: $(EXAMPLES)
|
||||
testprogs: $(TESTPROGS)
|
||||
@ -103,8 +103,6 @@ endef
|
||||
|
||||
$(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
|
||||
|
||||
include $(SRC_PATH)/doc/Makefile
|
||||
|
||||
define DOPROG
|
||||
OBJS-$(1) += $(1).o $(EXEOBJS) $(OBJS-$(1)-yes)
|
||||
$(1)$(PROGSSUF)_g$(EXESUF): $$(OBJS-$(1))
|
||||
|
||||
@ -465,7 +465,7 @@ HAVE_ATTRIBUTE_PACKED=yes
|
||||
HAVE_EBP_AVAILABLE=yes
|
||||
HAVE_EBX_AVAILABLE=yes
|
||||
!HAVE_GNU_AS=yes
|
||||
HAVE_GNU_WINDRES=yes
|
||||
!HAVE_GNU_WINDRES=yes
|
||||
!HAVE_IBM_ASM=yes
|
||||
HAVE_INLINE_ASM_LABELS=yes
|
||||
HAVE_INLINE_ASM_NONLOCAL_LABELS=yes
|
||||
|
||||
@ -37,7 +37,7 @@
|
||||
#include "bytestream.h"
|
||||
#include "hap.h"
|
||||
#include "internal.h"
|
||||
#include "memory.h"
|
||||
//#include "memory.h"
|
||||
#include "snappy.h"
|
||||
#include "texturedsp.h"
|
||||
#include "thread.h"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
LIBRARY= libsync
|
||||
|
||||
FASM = fasm.exe
|
||||
FASM = fasm
|
||||
AR = kos32-ar
|
||||
ARFLAGS = crs
|
||||
|
||||
|
||||
68
contrib/sdk/sources/libsync/m_lock_timeout.asm
Normal file
68
contrib/sdk/sources/libsync/m_lock_timeout.asm
Normal file
@ -0,0 +1,68 @@
|
||||
format MS COFF
|
||||
use32
|
||||
|
||||
MUTEX.lock equ 0
|
||||
MUTEX.handle equ 4
|
||||
|
||||
section '.text' align 16 code readable executable
|
||||
|
||||
@mutex_lock_timeout@8
|
||||
push esi
|
||||
mov esi, edx
|
||||
push ebx
|
||||
mov edx, 1
|
||||
lock xadd [ecx+MUTEX.lock], edx
|
||||
mov eax, 1
|
||||
test edx, edx
|
||||
jnz .slow
|
||||
.ok:
|
||||
pop ebx
|
||||
pop esi
|
||||
retn
|
||||
align 4
|
||||
.slow:
|
||||
mov edx, 2
|
||||
xchg edx, [ecx+MUTEX.lock]
|
||||
xor eax, eax
|
||||
test edx, edx
|
||||
jz .ok
|
||||
|
||||
mov edx, 2
|
||||
mov ecx, [ecx+MUTEX.handle]
|
||||
mov al, 77
|
||||
mov ebx, edx
|
||||
int 0x40
|
||||
add eax, 1
|
||||
pop ebx
|
||||
pop esi
|
||||
ret
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
|
||||
AR = kos32-ar
|
||||
FASM:= fasm.exe
|
||||
FASM:= fasm
|
||||
|
||||
TARGET:= libsound
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user