diff --git a/aegisub/config.h b/aegisub/config.h index 72ba9438c..a687ee086 100644 --- a/aegisub/config.h +++ b/aegisub/config.h @@ -10,5 +10,6 @@ // Unix specific settings and defines. #include "config/config_unix.h" +#include "posix/res.h" #endif // __WINDOWS__ diff --git a/aegisub/config/config_unix.h b/aegisub/config/config_unix.h index 69a55ff24..ed2a2f0d0 100644 --- a/aegisub/config/config_unix.h +++ b/aegisub/config/config_unix.h @@ -24,7 +24,5 @@ //typedef uint64_t __uint64; #define abs64 llabs -#include "res.h" - #endif /* _DEFINES_H */ diff --git a/libass/Makefile.am b/libass/Makefile.am index bb290e5e5..f410e52f9 100644 --- a/libass/Makefile.am +++ b/libass/Makefile.am @@ -1,6 +1,6 @@ noinst_LIBRARIES = libass_aegisub.a -AM_CPPFLAGS = @FREETYPE_CFLAGS@ -DCONFIG_ICONV -DCONFIG_FONTCONFIG @FONTCONFIG_CFLAGS@ @ICONV_CFLAGS@ +AM_CPPFLAGS = -I../aegisub @FREETYPE_CFLAGS@ -DCONFIG_ICONV -DCONFIG_FONTCONFIG @FONTCONFIG_CFLAGS@ @ICONV_CFLAGS@ if BUILD_DARWIN AM_CPPFLAGS += -DBUILD_DARWIN