Skip to content

Commit 24ab443

Browse files
ClnViewerClnViewer
committed
2 parents bb2245b + 1adfb78 commit 24ab443

File tree

2 files changed

+91
-100
lines changed

2 files changed

+91
-100
lines changed

‎cbp2ndk/cbp2ndk.cbp

Lines changed: 89 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,101 +1,92 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
22
<CodeBlocks_project_file>
3-
<FileVersion major="1" minor="6" />
4-
<Project>
5-
<Option title="cbp2ndk" />
6-
<Option pch_mode="2" />
7-
<Option compiler="gcc" />
8-
<Build>
9-
<Target title="Debug">
10-
<Option output="bin/Debug/cbp2ndk" prefix_auto="1" extension_auto="1" />
11-
<Option object_output="obj/Debug/" />
12-
<Option type="1" />
13-
<Option compiler="gcc" />
14-
<Option parameters="-t Debug -c bin\Debug\Test.cbp " />
15-
<Compiler>
16-
<Add option="-std=c++17" />
17-
<Add option="-m32" />
18-
<Add option="-g" />
19-
<Add option="-fvisibility=hidden" />
20-
<Add option="-fvisibility-inlines-hidden" />
21-
<Add option="-D_DEBUG=1" />
22-
</Compiler>
23-
<Linker>
24-
<Add option="-static-libstdc++" />
25-
<Add option="-static-libgcc" />
26-
<Add option="-static" />
27-
<Add option="-m32" />
28-
<Add option="-Wl,-rpath=./" />
29-
</Linker>
30-
<ExtraCommands>
31-
<Add after="cmd.exe /C copy dist\Test.cbp bin\Debug\Test.cbp" />
32-
</ExtraCommands>
33-
</Target>
34-
<Target title="Release">
35-
<Option output="bin/Release/cbp2ndk" prefix_auto="1" extension_auto="1" />
36-
<Option object_output="obj/Release/" />
37-
<Option type="1" />
38-
<Option compiler="gcc" />
39-
<Option parameters="-t Release -c bin\Release\Test.cbp " />
40-
<Compiler>
41-
<Add option="-O2" />
42-
<Add option="-std=c++17" />
43-
<Add option="-m32" />
44-
<Add option="-fvisibility=hidden" />
45-
<Add option="-fvisibility-inlines-hidden" />
46-
</Compiler>
47-
<Linker>
48-
<Add option="-s" />
49-
<Add option="-static-libstdc++" />
50-
<Add option="-static-libgcc" />
51-
<Add option="-static" />
52-
<Add option="-m32" />
53-
<Add option="-Wl,-rpath=./" />
54-
</Linker>
55-
<ExtraCommands>
56-
<Add after="upx.exe -9 bin\Release\cbp2ndk.exe" />
57-
<Add after="C:\__Bin\7Zip\7z a -mx9 -tzip ..\docs\cbp2ndk.zip bin\Release\cbp2ndk.exe" />
58-
<Add after="cmd.exe /C copy dist\Test.cbp bin\Release\Test.cbp" />
59-
<Add after="cmd.exe /C copy bin\Release\cbp2ndk.exe ..\CB-Template\autoinstall\src\CodeBlocks\templates\wizard\ndk_android\exec\cbp2ndk32.exe" />
60-
<Add after="cmd.exe /C C:\__Bin\InnoSetup6\Compil32.exe /cc ..\CB-Template\autoinstall\autoinstall.iss" />
61-
<Mode after="always" />
62-
</ExtraCommands>
63-
</Target>
64-
</Build>
65-
<Compiler>
66-
<Add option="-std=c++17" />
67-
<Add option="-m32" />
68-
<Add option="-Wall" />
69-
<Add option="-Wextra" />
70-
<Add option="-pedantic" />
71-
</Compiler>
72-
<Unit filename="src/cbp2ndk-CbConf.cpp" />
73-
<Unit filename="src/cbp2ndk-CbConf.h" />
74-
<Unit filename="src/cbp2ndk-dump.cpp" />
75-
<Unit filename="src/cbp2ndk-parse.cpp" />
76-
<Unit filename="src/cbp2ndk-write.cpp" />
77-
<Unit filename="src/cbp2ndk.cpp" />
78-
<Unit filename="src/cbp2ndk.h" />
79-
<Unit filename="src/cbp2ndk.rc">
80-
<Option compilerVar="WINDRES" />
81-
</Unit>
82-
<Unit filename="src/extern/argh.h" />
83-
<Unit filename="src/extern/tinyxml2.cpp" />
84-
<Unit filename="src/extern/tinyxml2.h" />
85-
<Unit filename="src/extern/tixml2cx.h" />
86-
<Unit filename="src/extern/tixml2ex.h" />
87-
<Unit filename="version.h" />
88-
<Extensions>
89-
<code_completion />
90-
<envvars />
91-
<debugger />
92-
<lib_finder disable_auto="1" />
93-
<AutoVersioning>
94-
<Scheme minor_max="10" build_max="0" rev_max="0" rev_rand_max="10" build_times_to_increment_minor="100" />
95-
<Settings autoincrement="1" date_declarations="1" use_define="1" update_manifest="1" do_auto_increment="1" ask_to_increment="0" language="C" svn="0" svn_directory="" header_path="version.h" />
96-
<Changes_Log show_changes_editor="0" app_title="released version %M.%m.%b of %p" changeslog_path="ChangesLog.txt" />
97-
<Code header_guard="VERSION_LOCAL_H" namespace="AutoVersion" prefix="CBP" />
98-
</AutoVersioning>
99-
</Extensions>
100-
</Project>
3+
<FileVersion major="1" minor="6" />
4+
<Project>
5+
<Option title="cbp2ndk" />
6+
<Option pch_mode="2" />
7+
<Option compiler="gcc" />
8+
<Build>
9+
<Target title="Debug">
10+
<Option output="bin/Debug/cbp2ndk" prefix_auto="1" extension_auto="1" />
11+
<Option object_output="obj/Debug/" />
12+
<Option type="1" />
13+
<Option compiler="gcc" />
14+
<Option parameters="-t Debug -c bin\Debug\Test.cbp " />
15+
<Compiler>
16+
<Add option="-g3" />
17+
<Add option="-D_DEBUG=1" />
18+
</Compiler>
19+
<ExtraCommands>
20+
<Add after="cmd.exe /C copy dist\Test.cbp bin\Debug\Test.cbp" />
21+
</ExtraCommands>
22+
</Target>
23+
<Target title="Release">
24+
<Option output="bin/Release/cbp2ndk" prefix_auto="1" extension_auto="1" />
25+
<Option object_output="obj/Release/" />
26+
<Option type="1" />
27+
<Option compiler="gcc" />
28+
<Option parameters="-t Release -c bin\Release\Test.cbp " />
29+
<Compiler>
30+
<Add option="-O2" />
31+
<Add option="-flto" />
32+
<Add option="-static" />
33+
<Add option="-static-libgcc" />
34+
<Add option="-static-libstdc++" />
35+
</Compiler>
36+
<Linker>
37+
<Add option="-s" />
38+
</Linker>
39+
<ExtraCommands>
40+
<Add after="upx.exe -9 bin\Release\cbp2ndk.exe" />
41+
<Add after="C:\__Bin\7Zip\7z a -mx9 -tzip ..\docs\cbp2ndk.zip bin\Release\cbp2ndk.exe" />
42+
<Add after="cmd.exe /C copy dist\Test.cbp bin\Release\Test.cbp" />
43+
<Add after="cmd.exe /C copy bin\Release\cbp2ndk.exe ..\CB-Template\autoinstall\src\CodeBlocks\templates\wizard\ndk_android\exec\cbp2ndk32.exe" />
44+
<Add after="cmd.exe /C C:\__Bin\InnoSetup6\Compil32.exe /cc ..\CB-Template\autoinstall\autoinstall.iss" />
45+
<Mode after="always" />
46+
</ExtraCommands>
47+
</Target>
48+
</Build>
49+
<Compiler>
50+
<Add option="-std=c++17" />
51+
<Add option="-m32" />
52+
<Add option="-Wall" />
53+
<Add option="-Wextra" />
54+
<Add option="-pedantic" />
55+
<Add option="-fexceptions" />
56+
<Add option="-Wno-unknown-pragmas" />
57+
<Add option="-fvisibility=hidden" />
58+
<Add option="-fvisibility-inlines-hidden" />
59+
</Compiler>
60+
<Linker>
61+
<Add option="-Wl,-rpath=./" />
62+
</Linker>
63+
<Unit filename="src/cbp2ndk-CbConf.cpp" />
64+
<Unit filename="src/cbp2ndk-CbConf.h" />
65+
<Unit filename="src/cbp2ndk-dump.cpp" />
66+
<Unit filename="src/cbp2ndk-parse.cpp" />
67+
<Unit filename="src/cbp2ndk-write.cpp" />
68+
<Unit filename="src/cbp2ndk.cpp" />
69+
<Unit filename="src/cbp2ndk.h" />
70+
<Unit filename="src/cbp2ndk.rc">
71+
<Option compilerVar="WINDRES" />
72+
</Unit>
73+
<Unit filename="src/extern/argh.h" />
74+
<Unit filename="src/extern/tinyxml2.cpp" />
75+
<Unit filename="src/extern/tinyxml2.h" />
76+
<Unit filename="src/extern/tixml2cx.h" />
77+
<Unit filename="src/extern/tixml2ex.h" />
78+
<Unit filename="version.h" />
79+
<Extensions>
80+
<code_completion />
81+
<envvars />
82+
<debugger />
83+
<lib_finder disable_auto="1" />
84+
<AutoVersioning>
85+
<Scheme minor_max="10" build_max="0" rev_max="0" rev_rand_max="10" build_times_to_increment_minor="100" />
86+
<Settings autoincrement="1" date_declarations="1" use_define="1" update_manifest="1" do_auto_increment="1" ask_to_increment="0" language="C" svn="0" svn_directory="" header_path="version.h" />
87+
<Changes_Log show_changes_editor="0" app_title="released version %M.%m.%b of %p" changeslog_path="ChangesLog.txt" />
88+
<Code header_guard="VERSION_LOCAL_H" namespace="AutoVersion" prefix="CBP" />
89+
</AutoVersioning>
90+
</Extensions>
91+
</Project>
10192
</CodeBlocks_project_file>

‎cbp2ndk/src/cbp2ndk.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@ int main(int argc, const char *argv[])
6363

6464
try
6565
{
66-
auto doc = tinyxml2::load_xmlfile(cnf.fname[0]);
66+
auto doc = tinyxml2::load_xmlfile(cnf.fname[0]);
6767

68-
if (cnf.isverb)
68+
if (cnf.isverb)
6969
std::cout << " * Open (xml): " << cnf.fname[0].c_str() << std::endl;
7070

7171
/// begin XML configuration parse

0 commit comments

Comments
 (0)