diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..947a43d --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.o +*.dll +*.so \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 95d3d16..1f87b1e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "rtaudio"] path = rtaudio url = https://github.com/tmatth/RtAudio.git +[submodule "luajit"] + path = luajit + url = https://github.com/LuaJIT/LuaJIT.git diff --git a/Makefile b/Makefile index 5636626..016c6c4 100644 --- a/Makefile +++ b/Makefile @@ -3,7 +3,7 @@ C = gcc CC = g++ CFLAGS = -O2 -Wall -fPIC # -D_DEBUG -g -INCDIR = -Irtaudio -Irtaudio/include -I../lua/src +INCDIR = -Irtaudio -Irtaudio/include -Iluajit/src # linker settings: LCC = ar @@ -45,7 +45,7 @@ else else # windows, MinGW LIBS = $(LIBDIR) $(LIB) -lole32 -ldsound -lwinmm -mconsole -s - LUALIB = -L../lua/src -llua51 + LUALIB = -Llua/src -llua51 SDLLIB = -lmingw32 -lSDLmain -lSDL -mconsole -s CFLAGS += -D__WINDOWS_DS__ DLLFLAGS = -shared @@ -96,7 +96,7 @@ playAudioSdl$(EXESUFFIX): playAudioSdl.o proAudio.o proAudioSdl.o stb_vorbis.o clean: rm -f *.o *~ $(OBJ) $(ALL) -#--- project specific dependencies --------------------------------- +#--- project specific dependencies --------------------------------- HDR = proAudio.h proAudioRt.h playAudioRt.o: playAudioRt.cpp $(HDR) serverAudioRt.o: serverAudioRt.cpp $(HDR) @@ -104,7 +104,7 @@ proAudioRt_lua.o: proAudioRt_lua.cpp $(HDR) proAudio.o: proAudio.cpp proAudio.h proAudioRt.o: proAudioRt.cpp $(HDR) stb_vorbis.o: stb_vorbis.c -rtaudio/RtAudio.o: rtaudio/RtAudio.cpp rtaudio/RtAudio.h rtaudio/RtError.h +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 diff --git a/example.exe b/example.exe new file mode 100644 index 0000000..f173ea3 Binary files /dev/null and b/example.exe differ diff --git a/libproAudio.a b/libproAudio.a new file mode 100644 index 0000000..d87c983 Binary files /dev/null and b/libproAudio.a differ diff --git a/lua51.lib b/lua51.lib new file mode 100644 index 0000000..9335bcc Binary files /dev/null and b/lua51.lib differ diff --git a/luajit b/luajit new file mode 160000 index 0000000..224129a --- /dev/null +++ b/luajit @@ -0,0 +1 @@ +Subproject commit 224129a8e64bfa219d35cd03055bf03952f167f6 diff --git a/make.exe b/make.exe new file mode 100644 index 0000000..58d49e3 Binary files /dev/null and b/make.exe differ diff --git a/playAudioRt.exe b/playAudioRt.exe new file mode 100644 index 0000000..263270e Binary files /dev/null and b/playAudioRt.exe differ diff --git a/rtaudio b/rtaudio index 2c84651..d6fd144 160000 --- a/rtaudio +++ b/rtaudio @@ -1 +1 @@ -Subproject commit 2c846516ff496ba471bb039932a206a4e37b71ae +Subproject commit d6fd1442b2fe1bb366c5539354eeb841fc6943a1