Skip to content

Commit 1c5f55d

Browse files
author
Tim S
committed
- build: Use ".lib" or ".include" in CB Global vars
1 parent b93bf17 commit 1c5f55d

8 files changed

Lines changed: 27 additions & 27 deletions

File tree

‎PythonCodeCompletion/PythonCodeCompletion-unix.cbp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
<Add option="-fPIC" />
2121
<Add directory="../XmlRpcEmbedder/XMLRPC/include" />
2222
<Add directory="../XmlRpcEmbedder" />
23-
<Add directory="$(#cb)/include" />
23+
<Add directory="$(#cb.include)" />
2424
<Add directory="$(#cb)/sdk/wxscintilla/include" />
2525
</Compiler>
2626
<Linker>

‎PythonCodeCompletion/PythonCodeCompletion.cbp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@
2525
<Add option="-DWX_PRECOMP" />
2626
<Add option="-DwxUSE_UNICODE" />
2727
<Add option="-D_WINDOWS" />
28-
<Add directory="$(#wx)/lib/gcc_dll/mswu" />
29-
<Add directory="$(#wx)/include" />
30-
<Add directory="$(#cb)/include" />
28+
<Add directory="$(#wx.lib)/gcc_dll/mswu" />
29+
<Add directory="$(#wx.include)" />
30+
<Add directory="$(#cb.include)" />
3131
<Add directory="$(#cb)/sdk/wxscintilla/include" />
3232
<Add directory="../XmlRpcEmbedder/XMLRPC/include" />
3333
<Add directory="../XmlRpcEmbedder" />
@@ -36,7 +36,7 @@
3636
<Add library="wxmsw28u" />
3737
<Add library="codeblocks" />
3838
<Add library="XmlRpcEmbedder" />
39-
<Add directory="$(#wx)/lib/gcc_dll" />
39+
<Add directory="$(#wx.lib)/gcc_dll" />
4040
<Add directory="$(#cb)/devel" />
4141
</Linker>
4242
<ExtraCommands>
@@ -65,9 +65,9 @@
6565
<Add option="-DWX_PRECOMP" />
6666
<Add option="-DwxUSE_UNICODE" />
6767
<Add option="-D_WINDOWS" />
68-
<Add directory="$(#wx)/lib/gcc_dll/mswu" />
69-
<Add directory="$(#wx)/include" />
70-
<Add directory="$(#cb)/include" />
68+
<Add directory="$(#wx.lib)/gcc_dll/mswu" />
69+
<Add directory="$(#wx.include)" />
70+
<Add directory="$(#cb.include)" />
7171
<Add directory="$(#cb)/sdk/wxscintilla/include" />
7272
<Add directory="../XmlRpcEmbedder/XMLRPC/include" />
7373
<Add directory="../XmlRpcEmbedder" />
@@ -76,7 +76,7 @@
7676
<Add library="wxmsw28u" />
7777
<Add library="codeblocks" />
7878
<Add library="XmlRpcEmbedder" />
79-
<Add directory="$(#wx)/lib/gcc_dll" />
79+
<Add directory="$(#wx.lib)/gcc_dll" />
8080
<Add directory="$(#cb)/devel" />
8181
</Linker>
8282
<ExtraCommands>

‎PythonDebugger/PythonDebugger-unix.cbp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<Compiler>
1717
<Add option="-ansi" />
1818
<Add option="-g" />
19-
<Add directory="$(#cb)/include" />
19+
<Add directory="$(#cb.include)" />
2020
<Add directory="$(#cb)/sdk/wxscintilla/include" />
2121
</Compiler>
2222
<Linker>

‎PythonDebugger/PythonDebugger.cbp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<Add option="-DCB_PRECOMP" />
3131
<Add option="-DWX_PRECOMP" />
3232
<Add option="-DwxUSE_UNICODE" />
33-
<Add directory="$(#cb)/include" />
33+
<Add directory="$(#cb.include)" />
3434
<Add directory="$(#cb)/sdk/wxscintilla/include" />
3535
<Add directory="$(#wx.include)" />
3636
<Add directory="$(#wx.lib)/gcc_dll/mswu" />
@@ -70,7 +70,7 @@
7070
<Add option="-DCB_PRECOMP" />
7171
<Add option="-DWX_PRECOMP" />
7272
<Add option="-DwxUSE_UNICODE" />
73-
<Add directory="$(#cb)/include" />
73+
<Add directory="$(#cb.include)" />
7474
<Add directory="$(#cb)/sdk/wxscintilla/include" />
7575
<Add directory="$(#wx.include)" />
7676
<Add directory="$(#wx.lib)/gcc_dll/mswu" />

‎PythonInterpreter/PythonInterpreter-unix.cbp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<Add option="-g" />
1919
<Add option="`wx-config --cflags`" />
2020
<Add option="`pkg-config --cflags codeblocks`" />
21-
<Add directory="$(#cb)/include" />
21+
<Add directory="$(#cb.include)" />
2222
</Compiler>
2323
<Linker>
2424
<Add option="-Wl,-z,defs" />
@@ -43,7 +43,7 @@
4343
<Add option="`wx-config --cflags`" />
4444
<Add option="-DTOOLSPLUSLINK" />
4545
<Add directory="$(#cb)/plugins/contrib/ToolsPlus" />
46-
<Add directory="$(#cb)/include" />
46+
<Add directory="$(#cb.include)" />
4747
</Compiler>
4848
<Linker>
4949
<Add option="-Wl,-z,defs" />

‎XmlRpcEmbedder/XmlRpcEmbedder.cbp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@
3737
<Add option="-DWXUSINGDLL" />
3838
<Add option="-DwxUSE_UNICODE" />
3939
<Add option="-D_WINDOWS" />
40-
<Add directory="$(#wx)/include" />
41-
<Add directory="$(#wx)/lib/gcc_dll/mswu" />
40+
<Add directory="$(#wx.include)" />
41+
<Add directory="$(#wx.lib)/gcc_dll/mswu" />
4242
<Add directory="XMLRPC/include" />
4343
</Compiler>
4444
<Linker>
4545
<Add library="wxmsw28u" />
4646
<Add library="Ws2_32" />
4747
<Add library="XmlRpc" />
48-
<Add directory="$(#wx)/lib/gcc_dll" />
48+
<Add directory="$(#wx.lib)/gcc_dll" />
4949
<Add directory="XMLRPC" />
5050
</Linker>
5151
</Target>
@@ -64,14 +64,14 @@
6464
<Add option="-DWXUSINGDLL" />
6565
<Add option="-DwxUSE_UNICODE" />
6666
<Add option="-D_WINDOWS" />
67-
<Add directory="$(#wx)/lib/gcc_dll/mswu" />
68-
<Add directory="$(#wx)/include" />
67+
<Add directory="$(#wx.lib)/gcc_dll/mswu" />
68+
<Add directory="$(#wx.include)" />
6969
<Add directory="XMLRPC/include" />
7070
</Compiler>
7171
<Linker>
7272
<Add library="Ws2_32" />
7373
<Add library="libwxmsw28u.a" />
74-
<Add directory="$(#wx)/lib/gcc_dll" />
74+
<Add directory="$(#wx.lib)/gcc_dll" />
7575
</Linker>
7676
</Target>
7777
<Target title="wxEmbedder-Mono">
@@ -90,14 +90,14 @@
9090
<Add option="-DWXUSINGDLL" />
9191
<Add option="-DwxUSE_UNICODE" />
9292
<Add option="-D_WINDOWS" />
93-
<Add directory="$(#wx)/lib/gcc_dll/mswu" />
94-
<Add directory="$(#wx)/include" />
93+
<Add directory="$(#wx.lib)/gcc_dll/mswu" />
94+
<Add directory="$(#wx.include)" />
9595
<Add directory="XMLRPC/include" />
9696
</Compiler>
9797
<Linker>
9898
<Add library="Ws2_32" />
9999
<Add library="libwxmsw28u.a" />
100-
<Add directory="$(#wx)/lib/gcc_dll" />
100+
<Add directory="$(#wx.lib)/gcc_dll" />
101101
</Linker>
102102
</Target>
103103
</Build>

‎codecheck/codechecker-unix.cbp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
<Add option="-fPIC" />
2424
<Add option="-DcbDEBUG" />
2525
<Add option="-DCB_PRECOMP" />
26-
<Add directory="$(#cb)/include" />
27-
<Add directory="$(#cb)/include/wxscintilla/include" />
26+
<Add directory="$(#cb.include)" />
27+
<Add directory="$(#cb.include)/wxscintilla/include" />
2828
</Compiler>
2929
<Linker>
3030
<Add option="`wx-config --libs`" />

‎codecheck/codechecker.cbp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@
2626
<Add option="-DCB_PRECOMP" />
2727
<Add option="-DWX_PRECOMP" />
2828
<Add option="-DwxUSE_UNICODE" />
29-
<Add directory="$(#cb)\include" />
30-
<Add directory="$(#cb)\include\wxscintilla\include" />
29+
<Add directory="$(#cb.include)" />
30+
<Add directory="$(#cb.include)\wxscintilla\include" />
3131
<Add directory="$(#wx.include)" />
3232
<Add directory="$(#wx.lib)\gcc_dll\mswu" />
3333
</Compiler>

0 commit comments

Comments
 (0)