Developer forums (C::B DEVELOPMENT STRICTLY!) > Development

Would it be an good idea to prefix headers with cb?

(1/1)

stahta01:
Would it be an good idea to prefix headers with cb?

If the Code::Blocks team thinks it is a good idea, I will work on the patches to make it happen.

Example

--- Code: ---#include <cb/sdk.h>

--- End code ---

Tim S

stahta01:
Patch to replace $(#cb)\include with $(#CB.include)

Tim S


--- Code: ---Index: src/plugins/loghacker/loghacker.cbp
===================================================================
--- src/plugins/loghacker/loghacker.cbp (revision 4790)
+++ src/plugins/loghacker/loghacker.cbp (working copy)
@@ -30,7 +30,7 @@
  <Add directory="$(#CB.include)" />
  <Add directory="$(#WX.include)" />
  <Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)\msw$(WX_SUFFIX)" />
- <Add directory="$(#CB)\include\wxscintilla\include" />
+ <Add directory="$(#CB.include)\wxscintilla\include" />
  </Compiler>
  <Linker>
  <Add library="wxmsw28$(WX_SUFFIX)" />
Index: src/plugins/contrib/wxSmithContribItems/wxSmithContribItems.cbp
===================================================================
--- src/plugins/contrib/wxSmithContribItems/wxSmithContribItems.cbp (revision 4790)
+++ src/plugins/contrib/wxSmithContribItems/wxSmithContribItems.cbp (working copy)
@@ -41,9 +41,9 @@
  <Add option="-DWXMAKINGLIB_PROPGRID" />
  <Add option="-DWXMAKINGDLL_THINGS" />
  <Add option="-DWXMAKINGDLL_CHART" />
- <Add directory="$(#cb)\include" />
- <Add directory="$(#cb)\include\wxscintilla\include" />
- <Add directory="$(#cb)\include\wxFlatNotebook\include" />
+ <Add directory="$(#CB.include)" />
+ <Add directory="$(#CB.include)\wxscintilla\include" />
+ <Add directory="$(#CB.include)\wxFlatNotebook\include" />
  <Add directory="$(#wx.include)" />
  <Add directory="$(#wx.lib)\gcc_dll$(WX_CFG)\msw$(WX_SUFFIX)" />
  <Add directory="..\wxSmith\propgrid\contrib\include" />
Index: src/plugins/contrib/ThreadSearch/ThreadSearch.cbp
===================================================================
--- src/plugins/contrib/ThreadSearch/ThreadSearch.cbp (revision 4790)
+++ src/plugins/contrib/ThreadSearch/ThreadSearch.cbp (working copy)
@@ -49,7 +49,7 @@
  <Add option="-DNO_LOGGING" />
  <Add directory="$(#CB.include)" />
  <Add directory="$(#CB.include)\wxscintilla\include" />
- <Add directory="$(#cb)\include\wxFlatNotebook\include" />
+ <Add directory="$(#CB.include)\wxFlatNotebook\include" />
  <Add directory="$(#WX.include)" />
  <Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)\msw$(WX_SUFFIX)" />
  </Compiler>
Index: src/plugins/contrib/codesnippets/codesnippets.cbp
===================================================================
--- src/plugins/contrib/codesnippets/codesnippets.cbp (revision 4790)
+++ src/plugins/contrib/codesnippets/codesnippets.cbp (working copy)
@@ -55,7 +55,7 @@
  <Add directory="$(#CB.include)" />
  <Add directory="$(#cb)\src" />
  <Add directory="$(#CB.include)\wxscintilla\include" />
- <Add directory="$(#cb)\include\wxFlatNotebook\include" />
+ <Add directory="$(#CB.include)\wxFlatNotebook\include" />
  <Add directory="$(#WX.include)" />
  <Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)\msw$(WX_SUFFIX)" />
  <Add directory="..\..\..\include\tinyxml" />
Index: src/plugins/contrib/codesnippets/codesnippets-unix.cbp
===================================================================
--- src/plugins/contrib/codesnippets/codesnippets-unix.cbp (revision 4790)
+++ src/plugins/contrib/codesnippets/codesnippets-unix.cbp (working copy)
@@ -47,9 +47,9 @@
  <Add option="-fPIC" />
  <Add option="`pkg-config --cflags gtk+-2.0`" />
  <Add option="-DcbDEBUG" />
- <Add directory="$(#cb)/include" />
- <Add directory="$(#cb)/include/wxscintilla/include" />
- <Add directory="$(#cb)/include/wxFlatNotebook/include" />
+ <Add directory="$(#cb.include)" />
+ <Add directory="$(#cb.include)/wxscintilla/include" />
+ <Add directory="$(#cb.include)/wxFlatNotebook/include" />
  </Compiler>
  <Linker>
  <Add option="`wx-config --libs`" />
Index: src/plugins/contrib/AutoVersioning/AutoVersioning.cbp
===================================================================
--- src/plugins/contrib/AutoVersioning/AutoVersioning.cbp (revision 4790)
+++ src/plugins/contrib/AutoVersioning/AutoVersioning.cbp (working copy)
@@ -29,7 +29,7 @@
  <Add directory="$(#CB.include)" />
  <Add directory="$(#WX.include)" />
  <Add directory="$(#WX.lib)\gcc_dll$(WX_CFG)\msw$(WX_SUFFIX)" />
- <Add directory="$(#CB)\include\wxscintilla\include" />
+ <Add directory="$(#CB.include)\wxscintilla\include" />
  </Compiler>
  <Linker>
  <Add option="-s" />

--- End code ---

MortenMacFly:

--- Quote from: stahta01 on January 10, 2008, 06:39:32 am ---Patch to replace $(#cb)\include with $(#CB.include)

--- End quote ---
Applied in SVN. Thanks.

--- Quote from: stahta01 on January 09, 2008, 11:25:30 pm ---Would it be an good idea to prefix headers with cb?

--- End quote ---
I don't think it's a good idea. Cause we have parts (e.g. wxscinitilla) that are not C::B but still belong to the SDK. So the drawback is that we would have to separate SDK headers which (I'm afraid) is not what we want.
Other than that: I could imagine using #include "sdk.h" for C::B (SDK) parts and #include <wx/wx.h> for other stuff... That's how I do it in my personal projects... but this might have drawbacks, too.

Navigation

[0] Message Index