Skip to content

Commit 0a32d9c

Browse files
spillzspillz
committed
PythonCodeCompletion: windows fixes (build against XmlRpcEmbedder monoDLL target)
1 parent 8099518 commit 0a32d9c

1 file changed

Lines changed: 16 additions & 31 deletions

File tree

‎PythonCodeCompletion/PythonCodeCompletion.cbp‎

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
<Option output="PythonCodeCompletion" prefix_auto="1" extension_auto="1" />
1111
<Option type="3" />
1212
<Option compiler="gcc" />
13-
<Option host_application="codeblocks" />
13+
<Option parameters="--debug-log --no-dde --no-check-associations --multiple-instance --no-splash-screen --verbose -p Debug" />
14+
<Option host_application="$(#cb)/devel/codeblocks" />
1415
<Option run_host_application_in_terminal="0" />
1516
<Compiler>
1617
<Add option="-g" />
@@ -19,31 +20,27 @@
1920
<Add option="-fmessage-length=0" />
2021
<Add option="-fexceptions" />
2122
<Add option="-Winvalid-pch" />
22-
<Add option="-DHAVE_W32API_H" />
2323
<Add option="-D__WXMSW__" />
2424
<Add option="-DWXUSINGDLL" />
25-
<Add option="-DcbDEBUG" />
26-
<Add option="-DCB_PRECOMP" />
2725
<Add option="-DWX_PRECOMP" />
2826
<Add option="-DwxUSE_UNICODE" />
2927
<Add option="-D_WINDOWS" />
30-
<Add option="-D_LIB" />
31-
<Add directory="XMLRPC/include" />
28+
<Add directory="$(#wx)/lib/gcc_dll/mswu" />
29+
<Add directory="$(#wx)/include" />
3230
<Add directory="$(#cb)/include" />
3331
<Add directory="$(#cb)/sdk/wxscintilla/include" />
34-
<Add directory="$(#wx)/include" />
35-
<Add directory="$(#wx)/lib/gcc_dll/mswu" />
32+
<Add directory="../XmlRpcEmbedder/XMLRPC/include" />
33+
<Add directory="../XmlRpcEmbedder" />
3634
</Compiler>
3735
<Linker>
36+
<Add library="wxmsw28u" />
37+
<Add library="codeblocks" />
3838
<Add library="XmlRpc" />
3939
<Add library="XmlRpcEmbedder" />
40-
<Add library="codeblocks" />
41-
<Add library="wxmsw28u" />
42-
<Add library="Ws2_32" />
43-
<Add directory="../XmlRpcEmbedder" />
44-
<Add directory="../XmlRpcEmbedder/XMLRPC" />
4540
<Add directory="$(#wx)/lib/gcc_dll" />
4641
<Add directory="$(#cb)/devel" />
42+
<Add directory="../XmlRpcEmbedder/XMLRPC" />
43+
<Add directory="../XmlRpcEmbedder" />
4744
</Linker>
4845
<ExtraCommands>
4946
<Add after="zip -j9 PythonCodeCompletion.zip manifest.xml" />
@@ -55,24 +52,12 @@
5552
<VirtualTargets>
5653
<Add alias="All" targets="CodeCompletion;" />
5754
</VirtualTargets>
58-
<Unit filename="PythonCodeCompletion.cpp">
59-
<Option target="CodeCompletion" />
60-
</Unit>
61-
<Unit filename="PythonCodeCompletion.h">
62-
<Option target="CodeCompletion" />
63-
</Unit>
64-
<Unit filename="manifest.xml">
65-
<Option target="CodeCompletion" />
66-
</Unit>
67-
<Unit filename="python/jedi_example.py">
68-
<Option target="CodeCompletion" />
69-
</Unit>
70-
<Unit filename="python/python_completion_server.py">
71-
<Option target="CodeCompletion" />
72-
</Unit>
73-
<Unit filename="python/stdlib_parser.py">
74-
<Option target="CodeCompletion" />
75-
</Unit>
55+
<Unit filename="PythonCodeCompletion.cpp" />
56+
<Unit filename="PythonCodeCompletion.h" />
57+
<Unit filename="manifest.xml" />
58+
<Unit filename="python/jedi_example.py" />
59+
<Unit filename="python/python_completion_server.py" />
60+
<Unit filename="python/stdlib_parser.py" />
7661
<Extensions>
7762
<code_completion />
7863
<envvars />

0 commit comments

Comments
 (0)