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

51 lines
1.3 KiB
Makefile
Raw Normal View History

Merge all changes from the libaegisub branch into trunk, the effective range is r4175:4330. All options have been re-done and now use Cajun to support a json-backed format. Initial support for low-level access and file I/O methods are included as well. Originally committed to SVN as r4331.
2010-05-21 03:13:36 +02:00
# $Id$
AUTOMAKE_OPTIONS = subdir-objects
AM_CXXFLAGS=
DISTCLEANFILES=
Rename 2.2 to 3.0 as this will now be the next version outside of 2.1. Originally committed to SVN as r4747.
2010-08-15 20:40:58 +02:00
lib_LTLIBRARIES = libaegisub-3.0.la
libaegisub_3_0_la_CPPFLAGS = -I../src/include -Iinclude -I. @WX_CPPFLAGS@ -pedantic -DLAGI
Remove some test code added when fixing the OSX build that slipped into r4743. Originally committed to SVN as r4745.
2010-08-14 20:57:29 +02:00
AM_LDFLAGS = @ICONV_LDFLAGS@
Merge all changes from the libaegisub branch into trunk, the effective range is r4175:4330. All options have been re-done and now use Cajun to support a json-backed format. Initial support for low-level access and file I/O methods are included as well. Originally committed to SVN as r4331.
2010-05-21 03:13:36 +02:00
if PRECOMPILED_HEADER
BUILT_SOURCES = lagi_pre.h.gch
AM_CXXFLAGS += -include lagi_pre.h -Winvalid-pch -fpch-deps -fpch-preprocess
Rename 2.2 to 3.0 as this will now be the next version outside of 2.1. Originally committed to SVN as r4747.
2010-08-15 20:40:58 +02:00
nodist_libaegisub_3_0_la_SOURCES = lagi_pre.h.gch
Merge all changes from the libaegisub branch into trunk, the effective range is r4175:4330. All options have been re-done and now use Cajun to support a json-backed format. Initial support for low-level access and file I/O methods are included as well. Originally committed to SVN as r4331.
2010-05-21 03:13:36 +02:00
endif
if PRECOMPILED_HEADER
# This doesn't depend on Makefile on purpose, you should already know what you're doing when using this.
lagi_pre.h.gch: lagi_pre.h
Rename 2.2 to 3.0 as this will now be the next version outside of 2.1. Originally committed to SVN as r4747.
2010-08-15 20:40:58 +02:00
@CXX@ $(libaegisub_3_0_la_CPPFLAGS) @CXXFLAGS@ @DEBUG_FLAGS@ -fPIC -DPIC lagi_pre.h
Merge all changes from the libaegisub branch into trunk, the effective range is r4175:4330. All options have been re-done and now use Cajun to support a json-backed format. Initial support for low-level access and file I/O methods are included as well. Originally committed to SVN as r4331.
2010-05-21 03:13:36 +02:00
DISTCLEANFILES += lagi_pre.h.gch
endif
Remove libosxutil and fold it into libaegisub. Originally committed to SVN as r4743.
2010-08-14 19:42:37 +02:00
if BUILD_DARWIN
AM_CXXFLAGS += -I/Developer/SDKs/MacOSX10.5.sdk/System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/Headers/
Re-add code removed in r4745 and conditionalise it under BUILD_DARWIN. Originally committed to SVN as r4746.
2010-08-15 18:55:52 +02:00
AM_LDFLAGS += -L../universalchardet -luniversalchardet
Remove libosxutil and fold it into libaegisub. Originally committed to SVN as r4743.
2010-08-14 19:42:37 +02:00
endif
Rename 2.2 to 3.0 as this will now be the next version outside of 2.1. Originally committed to SVN as r4747.
2010-08-15 20:40:58 +02:00
libaegisub_3_0_la_SOURCES = \
Add support for detecting character sets using UniversalChardet -- this superceeds character_detect.cpp. Originally committed to SVN as r4367.
2010-05-28 09:40:21 +02:00
common/charset.cpp \
Move most character set conversion code to libaegisub and make everything use the new conversion functionality. Originally committed to SVN as r4423.
2010-06-03 22:32:25 +02:00
common/charset_conv.cpp \
Add support for detecting character sets using UniversalChardet -- this superceeds character_detect.cpp. Originally committed to SVN as r4367.
2010-05-28 09:40:21 +02:00
common/charset_ucd.cpp \
Merge all changes from the libaegisub branch into trunk, the effective range is r4175:4330. All options have been re-done and now use Cajun to support a json-backed format. Initial support for low-level access and file I/O methods are included as well. Originally committed to SVN as r4331.
2010-05-21 03:13:36 +02:00
common/mru.cpp \
common/option.cpp \
Compiling, but untested, option change notifications. Doesn't seem to affect Aegisub aversely. Has the limitation that one object can only subscribe once to one option value, but that shouldn't actually be a problem. (One object cannot have two different of its member functions subscribing to one option value.) Originally committed to SVN as r4415.
2010-06-03 07:07:47 +02:00
common/option_value.cpp \
Merge all changes from the libaegisub branch into trunk, the effective range is r4175:4330. All options have been re-done and now use Cajun to support a json-backed format. Initial support for low-level access and file I/O methods are included as well. Originally committed to SVN as r4331.
2010-05-21 03:13:36 +02:00
common/option_visit.cpp \
Commit the beginings of a logging api, this is fairly complete however it has no locking. Originally committed to SVN as r4371.
2010-05-31 22:55:29 +02:00
common/log.cpp \
Merge all changes from the libaegisub branch into trunk, the effective range is r4175:4330. All options have been re-done and now use Cajun to support a json-backed format. Initial support for low-level access and file I/O methods are included as well. Originally committed to SVN as r4331.
2010-05-21 03:13:36 +02:00
common/validator.cpp \
Rewrite vfr.cpp in libaegisub with tests. Not yet used by Aegisub itself. Originally committed to SVN as r4661.
2010-07-07 07:24:16 +02:00
common/vfr.cpp \
Merge all changes from the libaegisub branch into trunk, the effective range is r4175:4330. All options have been re-done and now use Cajun to support a json-backed format. Initial support for low-level access and file I/O methods are included as well. Originally committed to SVN as r4331.
2010-05-21 03:13:36 +02:00
unix/util.cpp \
unix/io.cpp \
Split EmitterSTDOUT into unix/log.cpp and windows/log.cpp, the windows version is commented at the moment. Originally committed to SVN as r4397.
2010-06-01 10:17:27 +02:00
unix/access.cpp \
unix/log.cpp
Merge all changes from the libaegisub branch into trunk, the effective range is r4175:4330. All options have been re-done and now use Cajun to support a json-backed format. Initial support for low-level access and file I/O methods are included as well. Originally committed to SVN as r4331.
2010-05-21 03:13:36 +02:00
Remove libosxutil and fold it into libaegisub. Originally committed to SVN as r4743.
2010-08-14 19:42:37 +02:00
if BUILD_DARWIN
Rename 2.2 to 3.0 as this will now be the next version outside of 2.1. Originally committed to SVN as r4747.
2010-08-15 20:40:58 +02:00
libaegisub_3_0_la_SOURCES += \
Remove libosxutil and fold it into libaegisub. Originally committed to SVN as r4743.
2010-08-14 19:42:37 +02:00
osx/util.cpp
endif
Merge all changes from the libaegisub branch into trunk, the effective range is r4175:4330. All options have been re-done and now use Cajun to support a json-backed format. Initial support for low-level access and file I/O methods are included as well. Originally committed to SVN as r4331.
2010-05-21 03:13:36 +02:00
noinst_HEADERS = *.h