Compare commits

..

No commits in common. "v1.0" and "master" have entirely different histories.
v1.0 ... master

8 changed files with 4 additions and 38 deletions

1
.gitignore vendored
View File

@ -1,4 +1,3 @@
*.o
*.dll
*.so
*.exe

View File

@ -1,4 +1,3 @@
#LIBFLAG,
#--- generic settings ----------------------------------------------
# settings for C++ compiler:
C = gcc
@ -29,7 +28,7 @@ ifeq ($(ARCH),Linux)
LIBS += $(shell pkg-config --libs libpulse-simple)
endif
LUALIB = -lluajit -ldl
LUALIB = -llua -ldl
CFLAGS += -DHAVE_GETTIMEOFDAY $(if $(filter 1,$(USE_PULSE)),-D__LINUX_PULSE__,-D__LINUX_ALSA__) #-D__LINUX_OSS__
DLLFLAGS = -fPIC -shared
DLLSUFFIX = .so
@ -38,7 +37,7 @@ ifeq ($(ARCH),Linux)
else
ifeq ($(ARCH),Darwin) # MacOSX
LIBS = $(LIBDIR) $(LIB)
LUALIB = -L/usr/local/lib -lluajit
LUALIB = -L/usr/local/lib -llua
CFLAGS += -DHAVE_GETTIMEOFDAY -D__MACOSX_CORE__
DLLFLAGS = -bundle
DLLSUFFIX = .so
@ -46,7 +45,7 @@ else
else # windows, MinGW
LIBS = $(LIBDIR) $(LIB) -lole32 -ldsound -lwinmm -mconsole -s
LUALIB = -Lluajit/src -llua51
LUALIB = -Llua/src -llua51
SDLLIB = -lmingw32 -lSDLmain -lSDL -mconsole -s
CFLAGS += -D__WINDOWS_DS__
DLLFLAGS = -shared
@ -109,7 +108,3 @@ rtaudio/RtAudio.o: rtaudio/RtAudio.cpp rtaudio/RtAudio.h rtaudio/RtError.h
example.o: example.cpp $(HDR)
playAudioSdl.o: playAudioSdl.cpp proAudioSdl.h proAudio.h
proAudioSdl.o: proAudioSdl.cpp proAudioSdl.h proAudio.h
install:
echo "install"

BIN
example.exe Normal file

Binary file not shown.

Binary file not shown.

BIN
lua51.lib Normal file

Binary file not shown.

BIN
make.exe Normal file

Binary file not shown.

BIN
playAudioRt.exe Normal file

Binary file not shown.

View File

@ -1,28 +0,0 @@
package = "proteaaudio"
version = "1.0-0"
source = {
url = "git://github.com/rayaman/proteaAudio.git",
tag = "v1.0",
}
description = {
summary = "This project is a fork of: https://github.com/jkl1337/proteaAudio I felt adding luarock support would be helpful. This library provides simple audio functions. Can play .wav and .ogg files.",
homepage = "http://github.com/rayaman/proteaAudio",
license = "MIT",
maintainer = "Ryan Ward",
}
dependencies = {
"lua >= 5.1",
}
build = {
type = "builtin",
modules = {
timeutils = {
sources = { "src/main.cpp" }
}
},
}