iqbalrifai
/
Aegisub
mirror of https://github.com/odrling/Aegisub
1
0
Fork 0
Code Issues Releases Wiki Activity

Building on POSIX seems fixed again 

Originally committed to SVN as r1166.
This commit is contained in:
Niels Martin Hansen 2007-05-07 14:22:18 +00:00
parent 7f8d1a5a81
commit d3bf280993
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
aegisub/Makefile.am
View File

@ -4,8 +4,6 @@ EXTRA_DIST = res.rc $(srcdir)/*.h beautify
SUFFIXES = .c .cpp .rc SUFFIXES = .c .cpp .rc
## Most of these are just to catch extra sources for tarball.
## I'm not sure if the build subdir should be included here...? --jfs
SUBDIRS = bitmaps posix SUBDIRS = bitmaps posix
bin_PROGRAMS = aegisub bin_PROGRAMS = aegisub
@ -15,7 +13,7 @@ DARCSREV := $(strip $(shell head -n 1 ../_darcs/inventory 2>/dev/null))
REVISION := $(if $(SVNREV),-DBUILD_SVN_REVISION=$(SVNREV)) $(if $(DARCSREV),-DBUILD_DARCS) REVISION := $(if $(SVNREV),-DBUILD_SVN_REVISION=$(SVNREV)) $(if $(DARCSREV),-DBUILD_DARCS)
BUILDINFO := -DBUILD_CREDIT="\"$(shell whoami)\"" $(REVISION) BUILDINFO := -DBUILD_CREDIT="\"$(shell whoami)\"" $(REVISION)
AM_CPPFLAGST = -DAEGISUB -Iposix -include posix/defines.h $(BUILDINFO) AM_CPPFLAGS = -DAEGISUB -Iposix -include posix/defines.h $(BUILDINFO)
aegisub_LDADD = posix/libposix.a ../FexTrackerSource/libfex.a ../csri/lib/.libs/libcsri.a aegisub_LDADD = posix/libposix.a ../FexTrackerSource/libfex.a ../csri/lib/.libs/libcsri.a
aegisub_LDFLAGS = aegisub_LDFLAGS =
@ -50,7 +48,7 @@ AUTOMATION += auto4_auto3.cpp
endif endif
if WITH_AUTO4_RUBY if WITH_AUTO4_RUBY
AUTOMATION += auto4_ruby_assfile.cpp auto4_ruby.cpp auto4_ruby_dialog.cpp AUTOMATION += auto4_ruby_assfile.cpp auto4_ruby.cpp auto4_ruby_dialog.cpp
AM_CPPFLAGS = $(shell ruby -r rbconfig -e "p '-I' + Config::CONFIG['rubylibdir'] + '/' + Config::CONFIG['arch'] ") $(AM_CPPFLAGST) AM_CPPFLAGS += $(shell ruby -r rbconfig -e "p '-I' + Config::CONFIG['rubylibdir'] + '/' + Config::CONFIG['arch'] ") $(AM_CPPFLAGST)
endif endif
if HAVE_HUNSPELL if HAVE_HUNSPELL

1
aegisub/audio_player_alsa.cpp
View File

@ -430,6 +430,7 @@ void AlsaPlayer::async_write_handler(snd_async_handler_t *pcm_callback)
void *buf = malloc(player->period * player->bpf); void *buf = malloc(player->period * player->bpf);
while (frames >= player->period) { while (frames >= player->period) {
unsigned long start = player->cur_frame;
player->provider->GetAudioWithVolume(buf, player->cur_frame, player->period, player->volume); player->provider->GetAudioWithVolume(buf, player->cur_frame, player->period, player->volume);
snd_pcm_writei(player->pcm_handle, buf, player->period); snd_pcm_writei(player->pcm_handle, buf, player->period);
player->cur_frame += player->period; player->cur_frame += player->period;

4
aegisub/auto4_lua_scriptreader.h
View File

@ -51,4 +51,6 @@ namespace Automation4 {
static const char* reader_func(lua_State *L, void *data, size_t *size); static const char* reader_func(lua_State *L, void *data, size_t *size);
}; };
}; };

2
aegisub/factory.h
View File

@ -40,6 +40,8 @@
/////////// ///////////
// Headers // Headers
#include <map> #include <map>
#include <wx/string.h>
#include <wx/arrstr.h>
///////////////// /////////////////