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

64 lines
1.3 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 19:12:42 +00:00
include ../Makefile.inc
Statically link libaegisub Dynamically linking it caused a steady stream of issues for no apparent benefits.
2012-08-21 07:02:45 -07: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 19:12:42 +00:00
Always build with -g and optionally strip the debugging symbols on install so that crash backtraces aren't completely meaningless Originally committed to SVN as r6201.
2012-01-08 01:04:05 +00:00
CXXFLAGS += -Iinclude -I../src -I.. -DLAGI -fPIC -Wno-variadic-macros
Build and/or link the non-header-only boost libraries
2013-01-19 07:16:48 -08:00
CPPFLAGS += $(CPPFLAGS_BOOST)
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 19:12:42 +00: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 17:46:46 +00: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-02 16:27:33 -07:00
common/parser.o: CXXFLAGS += -ftemplate-depth=256
* Instead of ~ use getenv("HOME") to get the users home directory. * Fix Locale() to return P_LOCALE * Change data and doc values to P_DATA and P_DOC. Originally committed to SVN as r5322.
2011-02-08 04:22:52 +00:00
unix/path.o: CXXFLAGS += -DP_DATA=\"$(P_DATA)\" -DP_DOC=\"$(P_DOC)\" -DP_LOCALE=\"$(P_LOCALE)\"
Add support for removing ffms support and properly link ffms into libaegisub. Originally committed to SVN as r5283.
2011-02-03 18:08:41 +00: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 18:46:43 +00: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-17 15:06:48 -07:00
common/parser.cpp \
Replace syntax highlighting logic with new stuff in libaegisub
2012-10-29 17:33:16 -07:00
ass/dialogue_parser.cpp \
Move uuencoding logic to libaegisub and add tests
2013-02-07 09:36:47 -08:00
ass/uuencode.cpp \
Move cajun implementations from .inl files included by the headers to .cpp files Originally committed to SVN as r6004.
2011-12-22 21:10:10 +00:00
common/cajun/elements.cpp \
common/cajun/reader.cpp \
common/cajun/writer.cpp \
Extract calltip logic from the edit ctrl to libaegisub
2012-10-31 19:49:29 -07:00
common/calltip_provider.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 19:12:42 +00: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 19:04:49 +00: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 19:12:42 +00: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 07:09:14 -07:00
common/color.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 07:01:50 -08:00
common/dispatch.cpp \
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 13:00:46 +00:00
common/hotkey.cpp \
Remove the platform-specific agi::io implementations since they were nearly identical
2012-10-21 07:57:48 -07: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 13:00:46 +00: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 08:26:09 -07: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 06:32:53 -07: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 07:01:50 -08: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 19:12:42 +00: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 07:01:50 -08: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 01:36:50 +00: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 07:01:50 -08: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 19:12:42 +00:00
common/vfr.cpp \
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 07:01:50 -08: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 19:12:42 +00:00
ifeq (yes, $(BUILD_DARWIN))
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 03:13:49 +00:00
SRC += 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 19:12:42 +00: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 18:46:43 +00: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 19:12:42 +00: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 18:46:43 +00: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 03:13:49 +00: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 19:12:42 +00: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 21:27:39 +00:00
-include */*.d
Copy permalink