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

* BUILD_DARWIN was a define used for libass only, change it to __APPLE__ (sigh) 

* char config_path -> const char *config_path for non-MAC builds. not sure how the first version got in.

Originally committed to SVN as r3107.
This commit is contained in:
Amar Takhar 2009-07-12 20:10:25 +00:00
parent fa3f5d11ef
commit 24da41faaf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
aegisub/src/subtitles_provider_libass.cpp
View File

@ -47,7 +47,7 @@
#include "standard_paths.h"
#include <wx/filefn.h>
#ifdef BUILD_DARWIN
#ifdef __APPLE__
#include "libosxutil/libosxutil.h"
#include <sys/param.h>
#endif
@ -79,7 +79,7 @@ LibassSubtitlesProvider::LibassSubtitlesProvider() {
if (!ass_renderer) throw _T("ass_renderer_init failed");
ass_set_font_scale(ass_renderer, 1.);
#ifdef BUILD_DARWIN
#ifdef __APPLE__
char config_path[MAXPATHLEN];
char *config_dir;
@ -87,7 +87,7 @@ LibassSubtitlesProvider::LibassSubtitlesProvider() {
snprintf(config_path, MAXPATHLEN, "%s/etc/fonts/fonts.conf", config_dir);
free(config_dir);
#else
char config_path = NULL;
const char *config_path = NULL;
#endif
ass_set_fonts(ass_renderer, NULL, "Sans", 1, config_path);