Skip to content

PCH and Build fixes #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spillz merged 9 commits into from
Jun 4, 2018
Merged

PCH and Build fixes #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1c5f55d
- build: Use ".lib" or ".include" in CB Global vars
Apr 18, 2018
84e9b4f
- Update projects.
Apr 18, 2018
4f99087
- PythonCodeCompletion: PCH code fixes
Apr 18, 2018
0d27f14
- PythonDebugger: PCH code fixes
Apr 18, 2018
da3ae74
- PythonInterpreter: PCH code fixes
Apr 18, 2018
731cb8d
- XmlRpcEmbedder: PCH code fixes
Apr 18, 2018
13bec53
- PythonInterpreter: PCH code fixes
Apr 18, 2018
0319a25
* PythonInterpreter: Build fix by updating SCI macros
Apr 18, 2018
2307000
* PythonInterpreter: Possible build fix needs tested
Apr 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion PythonCodeCompletion/PythonCodeCompletion-unix.cbp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<Add option="-fPIC" />
<Add directory="../XmlRpcEmbedder/XMLRPC/include" />
<Add directory="../XmlRpcEmbedder" />
<Add directory="$(#cb)/include" />
<Add directory="$(#cb.include)" />
<Add directory="$(#cb)/sdk/wxscintilla/include" />
</Compiler>
<Linker>
Expand Down
23 changes: 13 additions & 10 deletions PythonCodeCompletion/PythonCodeCompletion.cbp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@
<Add option="-Winvalid-pch" />
<Add option="-D__WXMSW__" />
<Add option="-DWXUSINGDLL" />
<Add option="-DWX_PRECOMP" />
<Add option="-DwxUSE_UNICODE" />
<Add option="-D_WINDOWS" />
<Add directory="$(#wx)/lib/gcc_dll/mswu" />
<Add directory="$(#wx)/include" />
<Add directory="$(#cb)/include" />
<Add directory="$(#wx.lib)/gcc_dll/mswu" />
<Add directory="$(#wx.include)" />
<Add directory="$(#cb.include)" />
<Add directory="$(#cb.include)/tinyxml" />
<Add directory="$(#cb)/sdk/wxscintilla/include" />
<Add directory="../XmlRpcEmbedder/XMLRPC/include" />
<Add directory="../XmlRpcEmbedder" />
Expand All @@ -36,7 +36,7 @@
<Add library="wxmsw28u" />
<Add library="codeblocks" />
<Add library="XmlRpcEmbedder" />
<Add directory="$(#wx)/lib/gcc_dll" />
<Add directory="$(#wx.lib)/gcc_dll" />
<Add directory="$(#cb)/devel" />
</Linker>
<ExtraCommands>
Expand All @@ -62,12 +62,11 @@
<Add option="-Winvalid-pch" />
<Add option="-D__WXMSW__" />
<Add option="-DWXUSINGDLL" />
<Add option="-DWX_PRECOMP" />
<Add option="-DwxUSE_UNICODE" />
<Add option="-D_WINDOWS" />
<Add directory="$(#wx)/lib/gcc_dll/mswu" />
<Add directory="$(#wx)/include" />
<Add directory="$(#cb)/include" />
<Add directory="$(#wx.lib)/gcc_dll/mswu" />
<Add directory="$(#wx.include)" />
<Add directory="$(#cb.include)" />
<Add directory="$(#cb)/sdk/wxscintilla/include" />
<Add directory="../XmlRpcEmbedder/XMLRPC/include" />
<Add directory="../XmlRpcEmbedder" />
Expand All @@ -76,7 +75,7 @@
<Add library="wxmsw28u" />
<Add library="codeblocks" />
<Add library="XmlRpcEmbedder" />
<Add directory="$(#wx)/lib/gcc_dll" />
<Add directory="$(#wx.lib)/gcc_dll" />
<Add directory="$(#cb)/devel" />
</Linker>
<ExtraCommands>
Expand All @@ -89,6 +88,10 @@
<VirtualTargets>
<Add alias="All" targets="default;" />
</VirtualTargets>
<Compiler>
<Add option="-std=gnu++11" />
<Add option="-DNOPCH" />
</Compiler>
<Unit filename="PythonCodeCompletion.cpp" />
<Unit filename="PythonCodeCompletion.h" />
<Unit filename="manifest.xml" />
Expand Down
4 changes: 3 additions & 1 deletion PythonCodeCompletion/PythonCodeCompletion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#include <sdk.h> // Code::Blocks SDK
#include <sdk.h> // Code::Blocks SDK
#include <wx/menu.h>

#include <configurationpanel.h>
#include "PythonCodeCompletion.h"

Expand Down
6 changes: 0 additions & 6 deletions PythonCodeCompletion/PythonCodeCompletion.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@
#ifndef PYTHON_CODE_COMPLETION_H_INCLUDED
#define PYTHON_CODE_COMPLETION_H_INCLUDED

// For compilers that support precompilation, includes <wx/wx.h>
#include <wx/wxprec.h>

#ifndef WX_PRECOMP
#include <wx/wx.h>
#endif

#include <cbplugin.h> // for "class cbPlugin"
#include "xmlrpc_embedder.h"
Expand Down
2 changes: 1 addition & 1 deletion PythonDebugger/PythonDebugger-unix.cbp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<Compiler>
<Add option="-ansi" />
<Add option="-g" />
<Add directory="$(#cb)/include" />
<Add directory="$(#cb.include)" />
<Add directory="$(#cb)/sdk/wxscintilla/include" />
</Compiler>
<Linker>
Expand Down
10 changes: 6 additions & 4 deletions PythonDebugger/PythonDebugger.cbp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,8 @@
<Add option="-DCB_PRECOMP" />
<Add option="-DWX_PRECOMP" />
<Add option="-DwxUSE_UNICODE" />
<Add directory="$(#cb)/include" />
<Add directory="$(#cb.include)" />
<Add directory="$(#cb.include)/tinyxml" />
<Add directory="$(#cb)/sdk/wxscintilla/include" />
<Add directory="$(#wx.include)" />
<Add directory="$(#wx.lib)/gcc_dll/mswu" />
Expand Down Expand Up @@ -70,7 +71,8 @@
<Add option="-DCB_PRECOMP" />
<Add option="-DWX_PRECOMP" />
<Add option="-DwxUSE_UNICODE" />
<Add directory="$(#cb)/include" />
<Add directory="$(#cb.include)" />
<Add directory="$(#cb.include)/tinyxml" />
<Add directory="$(#cb)/sdk/wxscintilla/include" />
<Add directory="$(#wx.include)" />
<Add directory="$(#wx.lib)/gcc_dll/mswu" />
Expand All @@ -93,8 +95,8 @@
</VirtualTargets>
<Compiler>
<Add option="-Wall" />
<Add option="-DCB_PRECOMP" />
<Add option="-DWX_PRECOMP" />
<Add option="-std=gnu++11" />
<Add option="-DNOPCH" />
</Compiler>
<Unit filename="PythonDebugger.cpp" />
<Unit filename="PythonDebugger.h" />
Expand Down
16 changes: 11 additions & 5 deletions PythonDebugger/PythonDebugger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,15 @@
#include <wx/process.h>
#include <wx/regex.h>

#include <cbdebugger_interfaces.h>
#include <cbeditor.h>
#include <cbstyledtextctrl.h>
#include <configurationpanel.h>
#include <editormanager.h>
#include <logmanager.h>
//#include <watchesdlg.h>

#include "PythonDebugger.h"
#include <configurationpanel.h>
#include <wx/regex.h>
#include <cbdebugger_interfaces.h>
#include <cbstyledtextctrl.h>
//#include <watchesdlg.h>

// Register the plugin with Code::Blocks.
// We are using an anonymous namespace so we don't litter the global one.
Expand Down
17 changes: 8 additions & 9 deletions PythonDebugger/PythonDebugger.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,15 @@

#ifndef PYTHONDEBUGGER_H_INCLUDED
#define PYTHONDEBUGGER_H_INCLUDED

// For compilers that support precompilation, includes <wx/wx.h>
#include <wx/wxprec.h>

#ifndef WX_PRECOMP
#include <wx/wx.h>
#endif

#include <list>

#include <wx/stream.h>
#include <wx/timer.h>

#include <cbplugin.h> // for "class cbPlugin/cbDebuggerPlugin"
#include <loggers.h>
#include <logger.h>
#include <sdk.h>

#include <debuggermanager.h>
#include "debuggeroptionsdlg.h"
Expand All @@ -35,7 +32,9 @@
#define DBGCMDTYPE_USERCOMMAND 7
#define DBGCMDTYPE_CALLSTACK 8
#define DBGCMDTYPE_OTHER 9


class wxProcessEvent;
class wxTimerEvent;

typedef std::set<int> BPLtype;

Expand Down
66 changes: 37 additions & 29 deletions PythonInterpreter/PythonInterpCtrl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
#include <wx/notebook.h>
#include <wx/textctrl.h>
#include <wx/regex.h>
#include "PythonInterpCtrl.h"
#include <globals.h>
#include <wx/fontutil.h>

#include <wx/wxscintilla.h>
#include <cbcolourmanager.h>
#include <configmanager.h>
#include <editorcolourset.h>
#include <globals.h>
#include <infowindow.h>
#include <logmanager.h>

#include "PythonInterpCtrl.h"


//DECLARE_LOCAL_EVENT_TYPE(wxEVT_PY_NOTIFY_UI_CODEOK, -1)
DEFINE_EVENT_TYPE( wxEVT_PY_NOTIFY_UI_CODEOK )
Expand Down Expand Up @@ -166,17 +174,17 @@ PythonCodeCtrl::PythonCodeCtrl(wxWindow *parent, PythonInterpCtrl *py)
if (mgr->ReadBool(_T("/camel_case"), false))
{
// consider CamelCase for both: cursor movement with CTRL and selection with CTRL+SHIFT:
CmdKeyAssign(wxSCI_KEY_LEFT, wxSCI_SCMOD_CTRL, wxSCI_CMD_WORDPARTLEFT);
CmdKeyAssign(wxSCI_KEY_RIGHT, wxSCI_SCMOD_CTRL, wxSCI_CMD_WORDPARTRIGHT);
CmdKeyAssign(wxSCI_KEY_LEFT, wxSCI_SCMOD_CTRL|wxSCI_SCMOD_SHIFT, wxSCI_CMD_WORDPARTLEFTEXTEND);
CmdKeyAssign(wxSCI_KEY_RIGHT, wxSCI_SCMOD_CTRL|wxSCI_SCMOD_SHIFT, wxSCI_CMD_WORDPARTRIGHTEXTEND);
CmdKeyAssign(wxSCI_KEY_LEFT, wxSCI_KEYMOD_CTRL, wxSCI_CMD_WORDPARTLEFT);
CmdKeyAssign(wxSCI_KEY_RIGHT, wxSCI_KEYMOD_CTRL, wxSCI_CMD_WORDPARTRIGHT);
CmdKeyAssign(wxSCI_KEY_LEFT, wxSCI_KEYMOD_CTRL|wxSCI_KEYMOD_SHIFT, wxSCI_CMD_WORDPARTLEFTEXTEND);
CmdKeyAssign(wxSCI_KEY_RIGHT, wxSCI_KEYMOD_CTRL|wxSCI_KEYMOD_SHIFT, wxSCI_CMD_WORDPARTRIGHTEXTEND);
}
else // else set default "none CamelCase" key behavior (also default scintilla behaviour, see scintilla docs)
{
CmdKeyAssign(wxSCI_KEY_LEFT, wxSCI_SCMOD_CTRL, wxSCI_CMD_WORDLEFT);
CmdKeyAssign(wxSCI_KEY_RIGHT, wxSCI_SCMOD_CTRL, wxSCI_CMD_WORDRIGHT);
CmdKeyAssign(wxSCI_KEY_LEFT, wxSCI_SCMOD_CTRL|wxSCI_SCMOD_SHIFT, wxSCI_CMD_WORDLEFTEXTEND);
CmdKeyAssign(wxSCI_KEY_RIGHT, wxSCI_SCMOD_CTRL|wxSCI_SCMOD_SHIFT, wxSCI_CMD_WORDRIGHTEXTEND);
CmdKeyAssign(wxSCI_KEY_LEFT, wxSCI_KEYMOD_CTRL, wxSCI_CMD_WORDLEFT);
CmdKeyAssign(wxSCI_KEY_RIGHT, wxSCI_KEYMOD_CTRL, wxSCI_CMD_WORDRIGHT);
CmdKeyAssign(wxSCI_KEY_LEFT, wxSCI_KEYMOD_CTRL|wxSCI_KEYMOD_SHIFT, wxSCI_CMD_WORDLEFTEXTEND);
CmdKeyAssign(wxSCI_KEY_RIGHT, wxSCI_KEYMOD_CTRL|wxSCI_KEYMOD_SHIFT, wxSCI_CMD_WORDRIGHTEXTEND);
}

SetUseTabs(mgr->ReadBool(_T("/use_tab"), false));
Expand All @@ -190,42 +198,42 @@ PythonCodeCtrl::PythonCodeCtrl(wxWindow *parent, PythonInterpCtrl *py)
// otherwise to the start/end of the entire line.
// alt+home/end go to start/end of the entire line.
// in unwrapped mode, there is no difference between home/end and alt+home/end
CmdKeyAssign(wxSCI_KEY_END, wxSCI_SCMOD_NORM, wxSCI_CMD_LINEENDWRAP);
CmdKeyAssign(wxSCI_KEY_END, wxSCI_SCMOD_ALT, wxSCI_CMD_LINEEND);
CmdKeyAssign(wxSCI_KEY_END, wxSCI_SCMOD_SHIFT, wxSCI_CMD_LINEENDWRAPEXTEND);
CmdKeyAssign(wxSCI_KEY_END, wxSCI_SCMOD_SHIFT|wxSCI_SCMOD_ALT, wxSCI_CMD_LINEENDEXTEND);
CmdKeyAssign(wxSCI_KEY_END, wxSCI_KEYMOD_NORM, wxSCI_CMD_LINEENDWRAP);
CmdKeyAssign(wxSCI_KEY_END, wxSCI_KEYMOD_ALT, wxSCI_CMD_LINEEND);
CmdKeyAssign(wxSCI_KEY_END, wxSCI_KEYMOD_SHIFT, wxSCI_CMD_LINEENDWRAPEXTEND);
CmdKeyAssign(wxSCI_KEY_END, wxSCI_KEYMOD_SHIFT|wxSCI_KEYMOD_ALT, wxSCI_CMD_LINEENDEXTEND);

// if user wants "Home" key to set cursor to the very beginning of line
if (mgr->ReadBool(_T("/simplified_home"), false))
{
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_NORM,wxSCI_CMD_HOMEWRAP);
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_ALT,wxSCI_CMD_HOME);
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_SHIFT,wxSCI_CMD_HOMEWRAPEXTEND);
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_SHIFT|wxSCI_SCMOD_ALT,wxSCI_CMD_HOMEEXTEND);
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_NORM,wxSCI_CMD_HOMEWRAP);
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_ALT,wxSCI_CMD_HOME);
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_SHIFT,wxSCI_CMD_HOMEWRAPEXTEND);
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_SHIFT|wxSCI_KEYMOD_ALT,wxSCI_CMD_HOMEEXTEND);
}
else // else set default "Home" key behavior
{
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_NORM,wxSCI_CMD_VCHOMEWRAP);
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_ALT,wxSCI_CMD_VCHOME);
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_SHIFT,wxSCI_CMD_VCHOMEWRAPEXTEND);
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_SHIFT|wxSCI_SCMOD_ALT,wxSCI_CMD_VCHOMEEXTEND);
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_NORM,wxSCI_CMD_VCHOMEWRAP);
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_ALT,wxSCI_CMD_VCHOME);
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_SHIFT,wxSCI_CMD_VCHOMEWRAPEXTEND);
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_SHIFT|wxSCI_KEYMOD_ALT,wxSCI_CMD_VCHOMEEXTEND);
}
}
else
{ // in word wrap mode, home/end keys goto start/end of the entire line. alt+home/end goes to wrap points
CmdKeyAssign(wxSCI_KEY_END, wxSCI_SCMOD_ALT, wxSCI_CMD_LINEENDWRAP);
CmdKeyAssign(wxSCI_KEY_END, wxSCI_SCMOD_SHIFT|wxSCI_SCMOD_ALT, wxSCI_CMD_LINEENDWRAPEXTEND);
CmdKeyAssign(wxSCI_KEY_END, wxSCI_KEYMOD_ALT, wxSCI_CMD_LINEENDWRAP);
CmdKeyAssign(wxSCI_KEY_END, wxSCI_KEYMOD_SHIFT|wxSCI_KEYMOD_ALT, wxSCI_CMD_LINEENDWRAPEXTEND);

// if user wants "Home" key to set cursor to the very beginning of line
if (mgr->ReadBool(_T("/simplified_home"), false))
{
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_ALT,wxSCI_CMD_HOMEWRAP);
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_SHIFT|wxSCI_SCMOD_ALT,wxSCI_CMD_HOMEWRAPEXTEND);
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_ALT,wxSCI_CMD_HOMEWRAP);
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_SHIFT|wxSCI_KEYMOD_ALT,wxSCI_CMD_HOMEWRAPEXTEND);
}
else // else set default "Home" key behavior
{
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_ALT,wxSCI_CMD_VCHOMEWRAP);
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_SCMOD_SHIFT|wxSCI_SCMOD_ALT,wxSCI_CMD_VCHOMEWRAPEXTEND);
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_ALT,wxSCI_CMD_VCHOMEWRAP);
CmdKeyAssign(wxSCI_KEY_HOME,wxSCI_KEYMOD_SHIFT|wxSCI_KEYMOD_ALT,wxSCI_CMD_VCHOMEWRAPEXTEND);
}
}
SetViewEOL(mgr->ReadBool(_T("/show_eol"), false));
Expand All @@ -241,7 +249,7 @@ PythonCodeCtrl::PythonCodeCtrl(wxWindow *parent, PythonInterpCtrl *py)
SetTabWidth(mgr->ReadInt(_T("/tab_size"), 4));
SetIndent(mgr->ReadInt(_T("/tab_size"), 4)); //NEEDED FOR AUTO INDENTATION (NOT IN CB EDITOR)

em->GetColourSet()->Apply(_("Python"),this);
em->GetColourSet()->Apply(HighlightLanguage(wxT("Python")),this, false, true);

}

Expand Down
8 changes: 2 additions & 6 deletions PythonInterpreter/PythonInterpCtrl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
#ifndef PPCTRL_H
#define PPCTRL_H

#include <wx/wxprec.h>

#ifndef WX_PRECOMP
#include <wx/wx.h>
#ifndef WX_PRECOMP
#include <wx/splitter.h>
#endif

#include "xmlrpc_embedder.h"
#include "ShellCtrlBase.h"
#include "editormanager.h"
#include "cbstyledtextctrl.h"

#include <sdk.h>

class PythonInterpCtrl;

class PythonCodeCtrl: public cbStyledTextCtrl
Expand Down
4 changes: 2 additions & 2 deletions PythonInterpreter/PythonInterpreter-unix.cbp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<Add option="-g" />
<Add option="`wx-config --cflags`" />
<Add option="`pkg-config --cflags codeblocks`" />
<Add directory="$(#cb)/include" />
<Add directory="$(#cb.include)" />
</Compiler>
<Linker>
<Add option="-Wl,-z,defs" />
Expand All @@ -43,7 +43,7 @@
<Add option="`wx-config --cflags`" />
<Add option="-DTOOLSPLUSLINK" />
<Add directory="$(#cb)/plugins/contrib/ToolsPlus" />
<Add directory="$(#cb)/include" />
<Add directory="$(#cb.include)" />
</Compiler>
<Linker>
<Add option="-Wl,-z,defs" />
Expand Down
13 changes: 4 additions & 9 deletions PythonInterpreter/PythonInterpreter.cbp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,10 @@
<Add option="-Winvalid-pch" />
<Add option="-D__WXMSW__" />
<Add option="-DWXUSINGDLL" />
<Add option="-DCB_PRECOMP" />
<Add option="-DWX_PRECOMP" />
<Add option="-DwxUSE_UNICODE" />
<Add option="-D_WINDOWS" />
<Add directory="$(#cb.include)" />
<Add directory="$(#cb.include)/tinyxml" />
<Add directory="$(#cb)/sdk/wxscintilla/include" />
<Add directory="$(#wx.include)" />
<Add directory="$(#wx.lib)/gcc_dll/mswu" />
Expand Down Expand Up @@ -66,8 +65,6 @@
<Add option="-D__WXMSW__" />
<Add option="-DWXUSINGDLL" />
<Add option="-DcbDEBUG" />
<Add option="-DCB_PRECOMP" />
<Add option="-DWX_PRECOMP" />
<Add option="-DwxUSE_UNICODE" />
<Add option="-DTOOLSPLUSLINK" />
<Add option="-D_WINDOWS" />
Expand All @@ -83,7 +80,7 @@
<Add library="wxmsw28u" />
<Add library="codeblocks" />
<Add library="XmlRpcEmbedder" />
<Add library="$(#cb)\devel\share\CodeBlocks\plugins\ToolsPlus.dll" />
<Add library="$(#cb)/devel/share/CodeBlocks/plugins/ToolsPlus.dll" />
<Add directory="$(#cb)/devel" />
<Add directory="$(#wx.lib)/gcc_dll" />
<Add directory="$(#cb)/devel/share/CodeBlocks/plugins" />
Expand Down Expand Up @@ -111,8 +108,6 @@
<Add option="-Winvalid-pch" />
<Add option="-D__WXMSW__" />
<Add option="-DWXUSINGDLL" />
<Add option="-DCB_PRECOMP" />
<Add option="-DWX_PRECOMP" />
<Add option="-DwxUSE_UNICODE" />
<Add option="-D_WINDOWS" />
<Add directory="$(#cb.include)" />
Expand Down Expand Up @@ -141,8 +136,8 @@
</VirtualTargets>
<Compiler>
<Add option="-Wall" />
<Add option="-DCB_PRECOMP" />
<Add option="-DWX_PRECOMP" />
<Add option="-std=gnu++11" />
<Add option="-DNOPCH" />
</Compiler>
<Unit filename="PythonInterpCtrl.cpp" />
<Unit filename="PythonInterpCtrl.h" />
Expand Down
Loading