diff --git a/.gitignore b/.gitignore index 947a43d..91366ef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ *.o *.dll -*.so \ No newline at end of file +*.so +*.exe \ No newline at end of file diff --git a/Makefile b/Makefile index 016c6c4..0912415 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,4 @@ +#LIBFLAG, #--- generic settings ---------------------------------------------- # settings for C++ compiler: C = gcc @@ -28,7 +29,7 @@ ifeq ($(ARCH),Linux) LIBS += $(shell pkg-config --libs libpulse-simple) endif - LUALIB = -llua -ldl + LUALIB = -lluajit -ldl CFLAGS += -DHAVE_GETTIMEOFDAY $(if $(filter 1,$(USE_PULSE)),-D__LINUX_PULSE__,-D__LINUX_ALSA__) #-D__LINUX_OSS__ DLLFLAGS = -fPIC -shared DLLSUFFIX = .so @@ -37,7 +38,7 @@ ifeq ($(ARCH),Linux) else ifeq ($(ARCH),Darwin) # MacOSX LIBS = $(LIBDIR) $(LIB) - LUALIB = -L/usr/local/lib -llua + LUALIB = -L/usr/local/lib -lluajit CFLAGS += -DHAVE_GETTIMEOFDAY -D__MACOSX_CORE__ DLLFLAGS = -bundle DLLSUFFIX = .so @@ -45,7 +46,7 @@ else else # windows, MinGW LIBS = $(LIBDIR) $(LIB) -lole32 -ldsound -lwinmm -mconsole -s - LUALIB = -Llua/src -llua51 + LUALIB = -Lluajit/src -llua51 SDLLIB = -lmingw32 -lSDLmain -lSDL -mconsole -s CFLAGS += -D__WINDOWS_DS__ DLLFLAGS = -shared @@ -108,3 +109,7 @@ 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" + diff --git a/example.exe b/example.exe deleted file mode 100644 index f173ea3..0000000 Binary files a/example.exe and /dev/null differ diff --git a/libproAudio.a b/libproAudio.a index d87c983..87c1fe3 100644 Binary files a/libproAudio.a and b/libproAudio.a differ diff --git a/lua51.lib b/lua51.lib deleted file mode 100644 index 9335bcc..0000000 Binary files a/lua51.lib and /dev/null differ diff --git a/make.exe b/make.exe deleted file mode 100644 index 58d49e3..0000000 Binary files a/make.exe and /dev/null differ diff --git a/playAudioRt.exe b/playAudioRt.exe deleted file mode 100644 index 263270e..0000000 Binary files a/playAudioRt.exe and /dev/null differ diff --git a/rockspec/proteaaudio-1.0-0.rockspec b/rockspec/proteaaudio-1.0-0.rockspec new file mode 100644 index 0000000..f601a87 --- /dev/null +++ b/rockspec/proteaaudio-1.0-0.rockspec @@ -0,0 +1,28 @@ +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" } + } + }, +}