Skip to content

Commit 032e4c8

Browse files
manxoristmanxorist
committed
[Ref] mpt/textfile/textfile.hpp: Relicense and move text file handling from Settings here.
git-svn-id: https://source.openmpt.org/svn/openmpt/trunk/OpenMPT@24786 56274372-70c3-4bfc-bfc3-4c3a0b034d27
1 parent 7bf13e8 commit 032e4c8

File tree

192 files changed

+1010
-391
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

192 files changed

+1010
-391
lines changed

‎Makefile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2173,6 +2173,7 @@ bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION).makefile.tar: b
21732173
svn export ./src/mpt/system_error bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/system_error
21742174
svn export ./src/mpt/terminal bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/terminal
21752175
svn export ./src/mpt/test bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/test
2176+
#svn export ./src/mpt/textfile bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/textfile
21762177
svn export ./src/mpt/uuid bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/uuid
21772178
#svn export ./src/mpt/uuid_namespace bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/uuid_namespace
21782179
svn export ./src/openmpt/all bin/$(FLAVOUR_DIR)dist-tar/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/all
@@ -2282,6 +2283,7 @@ bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION).msvc.zip: bin/$
22822283
svn export ./src/mpt/system_error bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/system_error --native-eol CRLF
22832284
svn export ./src/mpt/terminal bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/terminal --native-eol CRLF
22842285
svn export ./src/mpt/test bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/test --native-eol CRLF
2286+
#svn export ./src/mpt/textfile bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/textfile --native-eol CRLF
22852287
svn export ./src/mpt/uuid bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/uuid --native-eol CRLF
22862288
#svn export ./src/mpt/uuid_namespace bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/mpt/uuid_namespace --native-eol CRLF
22872289
svn export ./src/openmpt/all bin/$(FLAVOUR_DIR)dist-zip/libopenmpt-$(DIST_LIBOPENMPT_VERSION)/src/openmpt/all --native-eol CRLF

‎build/autotools/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ MPT_FILES_SRC_MPT += src/mpt/terminal/stdio_manager.hpp
287287
MPT_FILES_SRC_MPT += src/mpt/terminal/transliterate.hpp
288288
MPT_FILES_SRC_MPT += src/mpt/test/test.hpp
289289
MPT_FILES_SRC_MPT += src/mpt/test/test_macros.hpp
290+
#MPT_FILES_SRC_MPT += src/mpt/textfile/textfile.hpp
290291
MPT_FILES_SRC_MPT += src/mpt/uuid/guid.hpp
291292
MPT_FILES_SRC_MPT += src/mpt/uuid/uuid.hpp
292293
#MPT_FILES_SRC_MPT += src/mpt/uuid_namespace/uuid_namespace.hpp

‎build/autotools/autoconfiscate.sh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ svn export ./src/mpt/string_transcode bin/dist-autotools/src/mpt
145145
svn export ./src/mpt/system_error bin/dist-autotools/src/mpt/system_error
146146
svn export ./src/mpt/terminal bin/dist-autotools/src/mpt/terminal
147147
svn export ./src/mpt/test bin/dist-autotools/src/mpt/test
148+
#svn export ./src/mpt/textfile bin/dist-autotools/src/mpt/textfile
148149
svn export ./src/mpt/uuid bin/dist-autotools/src/mpt/uuid
149150
#svn export ./src/mpt/uuid_namespace bin/dist-autotools/src/mpt/uuid_namespace
150151
mkdir -p bin/dist-autotools/src/openmpt
@@ -226,6 +227,7 @@ cp -r ./src/mpt/string_transcode bin/dist-autotools/src/mpt
226227
cp -r ./src/mpt/system_error bin/dist-autotools/src/mpt/system_error
227228
cp -r ./src/mpt/terminal bin/dist-autotools/src/mpt/terminal
228229
cp -r ./src/mpt/test bin/dist-autotools/src/mpt/test
230+
#cp -r ./src/mpt/textfile bin/dist-autotools/src/mpt/textfile
229231
cp -r ./src/mpt/uuid bin/dist-autotools/src/mpt/uuid
230232
#cp -r ./src/mpt/uuid_namespace bin/dist-autotools/src/mpt/uuid_namespace
231233
mkdir -p bin/dist-autotools/src/openmpt

‎build/premake-xcode/mpt-libopenmpt.lua‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@
5959
"../../src/mpt/profiler/**.hpp",
6060
"../../src/mpt/test/**.cpp",
6161
"../../src/mpt/test/**.hpp",
62+
"../../src/mpt/textfile/**.cpp",
63+
"../../src/mpt/textfile/**.hpp",
6264
"../../src/mpt/uuid_namespace/**.cpp",
6365
"../../src/mpt/uuid_namespace/**.hpp",
6466
"../../src/openmpt/sounddevice/**.cpp",

‎build/premake/mpt-libopenmpt-small.lua‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,8 @@ include_dependency "ext-stb_vorbis.lua"
8282
"../../src/mpt/terminal/**.hpp",
8383
"../../src/mpt/test/**.cpp",
8484
"../../src/mpt/test/**.hpp",
85+
"../../src/mpt/textfile/**.cpp",
86+
"../../src/mpt/textfile/**.hpp",
8587
"../../src/mpt/uuid_namespace/**.cpp",
8688
"../../src/mpt/uuid_namespace/**.hpp",
8789
"../../src/openmpt/sounddevice/**.cpp",

‎build/premake/mpt-libopenmpt.lua‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ include_dependency "ext-zlib.lua"
6969
"../../src/mpt/terminal/**.hpp",
7070
"../../src/mpt/test/**.cpp",
7171
"../../src/mpt/test/**.hpp",
72+
"../../src/mpt/textfile/**.cpp",
73+
"../../src/mpt/textfile/**.hpp",
7274
"../../src/mpt/uuid_namespace/**.cpp",
7375
"../../src/mpt/uuid_namespace/**.hpp",
7476
"../../src/openmpt/sounddevice/**.cpp",

‎build/premake/mpt-libopenmpt_test.lua‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ include_dependency "ext-zlib.lua"
8888
"../../src/mpt/profiler/**.hpp",
8989
"../../src/mpt/terminal/**.cpp",
9090
"../../src/mpt/terminal/**.hpp",
91+
"../../src/mpt/textfile/**.cpp",
92+
"../../src/mpt/textfile/**.hpp",
9193
"../../src/mpt/uuid_namespace/**.cpp",
9294
"../../src/mpt/uuid_namespace/**.hpp",
9395
"../../test/mpt_tests_crypto.cpp",

‎build/vs2017win7/OpenMPT-ANSI.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1198,6 +1198,7 @@
11981198
<ClInclude Include="..\..\src\mpt\system_error\system_error.hpp" />
11991199
<ClInclude Include="..\..\src\mpt\test\test.hpp" />
12001200
<ClInclude Include="..\..\src\mpt\test\test_macros.hpp" />
1201+
<ClInclude Include="..\..\src\mpt\textfile\textfile.hpp" />
12011202
<ClInclude Include="..\..\src\mpt\uuid\guid.hpp" />
12021203
<ClInclude Include="..\..\src\mpt\uuid\tests\tests_uuid.hpp" />
12031204
<ClInclude Include="..\..\src\mpt\uuid\uuid.hpp" />

‎build/vs2017win7/OpenMPT-ANSI.vcxproj.filters‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,6 +235,9 @@
235235
<Filter Include="src\mpt\test">
236236
<UniqueIdentifier>{BCC6D903-A829-69A8-51AF-A15E3DF1342B}</UniqueIdentifier>
237237
</Filter>
238+
<Filter Include="src\mpt\textfile">
239+
<UniqueIdentifier>{814B7A60-6D44-99B2-9676-7E3782CE78BE}</UniqueIdentifier>
240+
</Filter>
238241
<Filter Include="src\mpt\uuid">
239242
<UniqueIdentifier>{D395DA03-BFF8-69A8-687E-A25E54C0352B}</UniqueIdentifier>
240243
</Filter>
@@ -1674,6 +1677,9 @@
16741677
<ClInclude Include="..\..\src\mpt\test\test_macros.hpp">
16751678
<Filter>src\mpt\test</Filter>
16761679
</ClInclude>
1680+
<ClInclude Include="..\..\src\mpt\textfile\textfile.hpp">
1681+
<Filter>src\mpt\textfile</Filter>
1682+
</ClInclude>
16771683
<ClInclude Include="..\..\src\mpt\uuid\guid.hpp">
16781684
<Filter>src\mpt\uuid</Filter>
16791685
</ClInclude>

‎build/vs2017win7/OpenMPT-NativeSupport.vcxproj‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -875,6 +875,7 @@
875875
<ClInclude Include="..\..\src\mpt\system_error\system_error.hpp" />
876876
<ClInclude Include="..\..\src\mpt\test\test.hpp" />
877877
<ClInclude Include="..\..\src\mpt\test\test_macros.hpp" />
878+
<ClInclude Include="..\..\src\mpt\textfile\textfile.hpp" />
878879
<ClInclude Include="..\..\src\mpt\uuid\guid.hpp" />
879880
<ClInclude Include="..\..\src\mpt\uuid\tests\tests_uuid.hpp" />
880881
<ClInclude Include="..\..\src\mpt\uuid\uuid.hpp" />

0 commit comments

Comments
 (0)