Browse Source

Remove dependency on asio headers

Signed-off-by: falkTX <falktx@falktx.com>
tags/v1.3.0
falkTX 7 months ago
parent
commit
8d0d748efd
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
7 changed files with 470 additions and 473 deletions
  1. +0
    -3
      .gitmodules
  2. +1
    -6
      Makefile.mk
  3. +467
    -451
      asio.c
  4. +1
    -1
      docker/Dockerfile
  5. +0
    -10
      prepare_64bit_asio.sh
  6. +1
    -1
      regsvr.c
  7. +0
    -1
      rtaudio

+ 0
- 3
.gitmodules View File

@@ -1,3 +0,0 @@
[submodule "rtaudio"]
path = rtaudio
url = https://github.com/falkTX/rtaudio.git

+ 1
- 6
Makefile.mk View File

@@ -42,11 +42,6 @@ INCLUDE_PATH += -I/opt/wine-staging/include
INCLUDE_PATH += -I/opt/wine-staging/include/wine/windows
LIBRARIES = $(shell pkg-config --libs jack)

# 64bit build needs an extra flag
ifeq ($(M),64)
CEXTRA += -DNATIVE_INT64
endif

# Debug or Release
ifeq ($(DEBUG),true)
CEXTRA += -O0 -DDEBUG -g -D__WINESRC__
@@ -89,7 +84,7 @@ C_SRCS = $(wineasio_dll_C_SRCS)
### Generic targets

all:
build: rtaudio/include/asio.h $(DLLS:%=build$(M)/%)
build: $(DLLS:%=build$(M)/%)

### Build rules



+ 467
- 451
asio.c
File diff suppressed because it is too large
View File


+ 1
- 1
docker/Dockerfile View File

@@ -22,7 +22,7 @@ RUN apt-get update -qq && \
apt-get clean

# fetch wineasio
RUN git clone --recursive https://github.com/wineasio/wineasio.git --depth=1
RUN git clone https://github.com/wineasio/wineasio.git --depth=1

# build wineasio
WORKDIR /wineasio


+ 0
- 10
prepare_64bit_asio.sh View File

@@ -1,10 +0,0 @@
#!/bin/sh
set -e
sed -i asio.h -e 's/unsigned long/ULONG/g'
sed -i asio.h -e 's/long long int/LONGLONG/g'
sed -i asio.h -e 's/long int/LONG/g'
sed -i asio.h -e 's/long/LONG/g'
sed -i asio.h -e 's/(\*bufferSwitch)/(CALLBACK *bufferSwitch)/g'
sed -i asio.h -e 's/(\*sampleRateDidChange)/(CALLBACK *sampleRateDidChange)/g'
sed -i asio.h -e 's/(\*asioMessage)/(CALLBACK *asioMessage)/g'
sed -i asio.h -e 's/(\*bufferSwitchTimeInfo)/(CALLBACK *bufferSwitchTimeInfo)/g'

+ 1
- 1
regsvr.c View File

@@ -510,7 +510,7 @@ static struct regsvr_coclass const coclass_list[] = {
{ &CLSID_WineASIO,
"WineASIO Object",
NULL,
#ifdef NATIVE_INT64
#ifdef _WIN64
"wineasio64.dll",
#else
"wineasio32.dll",


+ 0
- 1
rtaudio

@@ -1 +0,0 @@
Subproject commit e03448bd15c1c34e842459939d755f5f89e880ed

Loading…
Cancel
Save