mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity
Aegisub/libaegisub/Makefile

77 lines
1.6 KiB
Makefile
Raw Normal View History

Merge r4855-4894 from the new_build_system branch. This still has rough spots and some of the dependency relations haven't been expressed but it works, and it's much better than what we had before as it kills off automake, libtool, gettext (package not library), intltool usage. Originally committed to SVN as r4895.
2010-12-05 20:12:42 +01:00
include ../Makefile.inc
Statically link libaegisub Dynamically linking it caused a steady stream of issues for no apparent benefits.
2012-08-21 16:02:45 +02:00
LIB = libaegisub.a
Merge r4855-4894 from the new_build_system branch. This still has rough spots and some of the dependency relations haven't been expressed but it works, and it's much better than what we had before as it kills off automake, libtool, gettext (package not library), intltool usage. Originally committed to SVN as r4895.
2010-12-05 20:12:42 +01:00
Remove -Wno-variadic-macros from CXXFLAGS It's no longer nonstandard in C++11.
2014-04-23 23:54:21 +02:00
CXXFLAGS += -Iinclude -I../src -I.. -fPIC
Switch from regular Lua to LuaJIT
2014-04-28 04:45:14 +02:00
CPPFLAGS += $(CPPFLAGS_BOOST) $(CFLAGS_LUA)
Merge r4855-4894 from the new_build_system branch. This still has rough spots and some of the dependency relations haven't been expressed but it works, and it's much better than what we had before as it kills off automake, libtool, gettext (package not library), intltool usage. Originally committed to SVN as r4895.
2010-12-05 20:12:42 +01:00
PRECOMPILED_HEADER_NAME = lagi_pre.h
lagi_pre.h.gch: CXXFLAGS := $(CXXFLAGS)
Ensure the proper cflags are set for common/charset_conv.cpp in libaegisub. Also fix iconv include path on *bsd. Originally committed to SVN as r5145.
2011-01-08 18:46:46 +01:00
common/charset_conv.o: CXXFLAGS += $(CFLAGS_ICONV)
Increase maximum template depth for parser.o The latest version of clang has reduced the default.
2013-10-03 01:27:33 +02:00
common/parser.o: CXXFLAGS += -ftemplate-depth=256
Remove the ?docs token It's not actually used anywhere and not even set on Windows.
2014-06-04 02:08:29 +02:00
unix/path.o: CXXFLAGS += -DP_DATA=\"$(P_DATA)\"
Add support for removing ffms support and properly link ffms into libaegisub. Originally committed to SVN as r5283.
2011-02-03 19:08:41 +01:00
Update distdir generation The list of files to include was out of date and only included files for dependencies which were actually enabled, and the script was FreeBSD-specific. Originally committed to SVN as r6298.
2012-01-14 19:46:43 +01:00
SRC += \
Build parser.cpp first Shaves a few seconds off parallel builds with 4+ cores by avoiding having everything else finish while it's still building.
2013-08-18 00:06:48 +02:00
common/parser.cpp \
Replace syntax highlighting logic with new stuff in libaegisub
2012-10-30 01:33:16 +01:00
ass/dialogue_parser.cpp \
Move cajun implementations from .inl files included by the headers to .cpp files Originally committed to SVN as r6004.
2011-12-22 22:10:10 +01:00
common/cajun/elements.cpp \
common/cajun/reader.cpp \
common/cajun/writer.cpp \
Extract calltip logic from the edit ctrl to libaegisub
2012-11-01 03:49:29 +01:00
common/calltip_provider.cpp \
Move character count stuff to libaegisub
2014-04-19 02:18:41 +02:00
common/character_count.cpp \
Merge r4855-4894 from the new_build_system branch. This still has rough spots and some of the dependency relations haven't been expressed but it works, and it's much better than what we had before as it kills off automake, libtool, gettext (package not library), intltool usage. Originally committed to SVN as r4895.
2010-12-05 20:12:42 +01:00
common/charset.cpp \
Add converter to ISO-6937-2 glibc's iconv implementation supports ISO-6937-2, but libiconv doesn't due to that these days the only place it's used is in a few old subtitle formats. As a result, on everything but linux we need our own converter. Conversion from ISO-6937-2 is currently not supported. Originally committed to SVN as r6632.
2012-03-29 21:04:49 +02:00
common/charset_6937.cpp \
Merge r4855-4894 from the new_build_system branch. This still has rough spots and some of the dependency relations haven't been expressed but it works, and it's much better than what we had before as it kills off automake, libtool, gettext (package not library), intltool usage. Originally committed to SVN as r4895.
2010-12-05 20:12:42 +01:00
common/charset_conv.cpp \
Replace AssColor with agi::Color Add agi::Color, and replace AssColor and all uses of wxColor that are not immediately passed to/from wx with it.
2012-10-26 16:09:14 +02:00
common/color.cpp \
Use boost.interprocess's mmap wrapper in the PCM provider
2014-03-20 23:26:28 +01:00
common/file_mapping.cpp \
Extract some of the string formatter implementation to format.cpp
2014-05-30 03:56:44 +02:00
common/format.cpp \
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
common/fs.cpp \
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258. Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
common/hotkey.cpp \
Remove the platform-specific agi::io implementations since they were nearly identical
2012-10-21 16:57:48 +02:00
common/io.cpp \
Merge the dynamic menu, hotkey and toolbar branch to trunk. This doesn't include Windows support as vs2008 was being a major pain. This involves revisions r4921:4950, r4961:5002, r5005:5006, r5008:5056, r5062:5065, r5072, r5081:5082, r5087, r5096:5110, r5124:5125. Updates #1258. Originally committed to SVN as r5126.
2011-01-05 14:00:46 +01:00
common/json.cpp \
Rewrite the auto-matcher for the karaoke timing copier Operate on characters rather than bytes in the dialog so that it actually works with Kanji. Rewrite the auto-matcher to handle more cases and add unit tests for it.
2013-07-13 17:26:09 +02:00
common/kana_table.cpp \
common/karaoke_matcher.cpp \
Move agi::Color parsing to its own file Keeping all uses of boost.spirit in a single translation unit helps avoid having it murder compile times, which requires that it be off by itself.
2012-10-27 15:32:53 +02:00
common/keyframe.cpp \
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
common/log.cpp \
Merge r4855-4894 from the new_build_system branch. This still has rough spots and some of the dependency relations haven't been expressed but it works, and it's much better than what we had before as it kills off automake, libtool, gettext (package not library), intltool usage. Originally committed to SVN as r4895.
2010-12-05 20:12:42 +01:00
common/mru.cpp \
common/option.cpp \
common/option_visit.cpp \
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
common/path.cpp \
Replace MyThes thesaurus implementation with a custom one Fixes a pile of unicode-related issues, such as dictionaries in a path which does not fit into the system's local charset, and significantly cuts down on the amount of code. Originally committed to SVN as r6250.
2012-01-08 02:36:50 +01:00
common/thesaurus.cpp \
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
common/util.cpp \
Merge r4855-4894 from the new_build_system branch. This still has rough spots and some of the dependency relations haven't been expressed but it works, and it's much better than what we had before as it kills off automake, libtool, gettext (package not library), intltool usage. Originally committed to SVN as r4895.
2010-12-05 20:12:42 +01:00
common/vfr.cpp \
Add RGB <-> YCbCr conversion stuff to libaegisub
2013-08-25 15:27:13 +02:00
common/ycbcr_conv.cpp \
Move some of the automation machinery to libaegisub
2014-03-27 03:24:37 +01:00
lua/modules.cpp \
Switch automation tests to busted This requires shuffling a bunch of stuff around to get a CLI lua executable that uses an automation-like environment, but that's something that'll be nice to have in the future anyway. Busted indirectly depends on lfs and we currently can't use external binary modules, so add a copy of lfs to the repo and build it with Aegisub.
2014-04-26 00:40:43 +02:00
lua/modules/lfs.cpp \
Switch back to building Lua as C In preparation for switching to LuaJIT, which doesn't support PUC Lua's thing of using C++ exceptions for lua_error. Requires replacing all uses of lua_error (and things calling lua_error) with custom versions that throw an exception instead and adding an exception -> lua error wrapper at all C++ -> Lua boundaries.
2014-04-27 16:20:11 +02:00
lua/modules/lpeg.c \
Move some of the automation machinery to libaegisub
2014-03-27 03:24:37 +01:00
lua/modules/re.cpp \
Add unicode case conversion functions to the automation module
2014-05-09 15:41:47 +02:00
lua/modules/unicode.cpp \
Move some of the automation machinery to libaegisub
2014-03-27 03:24:37 +01:00
lua/script_reader.cpp \
Switch automation tests to busted This requires shuffling a bunch of stuff around to get a CLI lua executable that uses an automation-like environment, but that's something that'll be nice to have in the future anyway. Busted indirectly depends on lfs and we currently can't use external binary modules, so add a copy of lfs to the repo and build it with Aegisub.
2014-04-26 00:40:43 +02:00
lua/utils.cpp \
Merge r4855-4894 from the new_build_system branch. This still has rough spots and some of the dependency relations haven't been expressed but it works, and it's much better than what we had before as it kills off automake, libtool, gettext (package not library), intltool usage. Originally committed to SVN as r4895.
2010-12-05 20:12:42 +01:00
unix/access.cpp \
Mostly purge wxWidgets from non-UI stuff Use boost::filesystem::path for all paths, and std::string for all other strings, converting to/from wxString as close to the actual uses of wx as possible. Where possible, replace the uses of non-UI wxWidgets functionality with the additions to the standard library in C++11, or the equivalents in boost. Move the path token management logic to libaegisub (and rewrite it in the process). Add a basic thread pool based on asio and std::thread to libaegisub. This touches nearly every file in the project and a nontrivial amount of code had to be rewritten entirely, so there's probably a lot of broken stuff.
2013-01-04 16:01:50 +01:00
unix/fs.cpp \
unix/log.cpp \
unix/path.cpp \
unix/util.cpp
Merge r4855-4894 from the new_build_system branch. This still has rough spots and some of the dependency relations haven't been expressed but it works, and it's much better than what we had before as it kills off automake, libtool, gettext (package not library), intltool usage. Originally committed to SVN as r4895.
2010-12-05 20:12:42 +01:00
ifeq (yes, $(BUILD_DARWIN))
Use GCD on OS X rather than boost.asio for the thread pool
2014-06-07 15:26:31 +02:00
SRC += osx/util.mm osx/dispatch.mm
else
SRC += common/dispatch.cpp
Merge r4855-4894 from the new_build_system branch. This still has rough spots and some of the dependency relations haven't been expressed but it works, and it's much better than what we had before as it kills off automake, libtool, gettext (package not library), intltool usage. Originally committed to SVN as r4895.
2010-12-05 20:12:42 +01:00
endif
Update distdir generation The list of files to include was out of date and only included files for dependencies which were actually enabled, and the script was FreeBSD-specific. Originally committed to SVN as r6298.
2012-01-14 19:46:43 +01:00
HEADER += \
*.h \
Merge r4855-4894 from the new_build_system branch. This still has rough spots and some of the dependency relations haven't been expressed but it works, and it's much better than what we had before as it kills off automake, libtool, gettext (package not library), intltool usage. Originally committed to SVN as r4895.
2010-12-05 20:12:42 +01:00
*/*.h \
Update distdir generation The list of files to include was out of date and only included files for dependencies which were actually enabled, and the script was FreeBSD-specific. Originally committed to SVN as r6298.
2012-01-14 19:46:43 +01:00
include/libaegisub/*.h \
include/libaegisub/charsets.def \
include/libaegisub/cajun/*.h
Rewrite the OS X bundle utils in Obj-C++ and return std::strings rather than malloced char * Originally committed to SVN as r6896.
2012-06-12 05:13:49 +02:00
EXTRA_DIST += osx/util.mm
Merge r4855-4894 from the new_build_system branch. This still has rough spots and some of the dependency relations haven't been expressed but it works, and it's much better than what we had before as it kills off automake, libtool, gettext (package not library), intltool usage. Originally committed to SVN as r4895.
2010-12-05 20:12:42 +01:00
include ../Makefile.target
Include dependency files into the Makefiles. This gives us dep tracking for headers. Originally committed to SVN as r5162.
2011-01-10 22:27:39 +01:00
-include */*.d
Switch back to building Lua as C In preparation for switching to LuaJIT, which doesn't support PUC Lua's thing of using C++ exceptions for lua_error. Requires replacing all uses of lua_error (and things calling lua_error) with custom versions that throw an exception instead and adding an exception -> lua error wrapper at all C++ -> Lua boundaries.
2014-04-27 16:20:11 +02:00
-include lua/*/*.d
-include common/*/*.d
Copy permalink