--- CodeBlocks-unix.cbp.orig	Sun Nov 27 15:12:34 2005
+++ CodeBlocks-unix.cbp	Sun Nov 27 15:12:46 2005
@@ -56,6 +56,7 @@
 					<Add option="-DEXPORT_EVENTS"/>
 					<Add option="-D_USRDLL"/>
 					<Add directory="sdk/tinyxml"/>
+					<Add directory="sdk"/>
 				</Compiler>
 				<Linker>
 					<Add library="libtxml.a"/>
@@ -339,18 +340,37 @@
 					<Add option="-Os"/>
 				</Compiler>
 			</Target>
+			<Target title="doc">
+				<Option output=""/>
+				<Option working_dir=""/>
+				<Option object_output="/home/mandrav/devel/codeblocks/src//.objs"/>
+				<Option deps_output="/home/mandrav/devel/codeblocks/src//.deps"/>
+				<Option external_deps=""/>
+				<Option type="-1"/>
+				<Option compiler="0"/>
+				<Option includeInTargetAll="0"/>
+				<Option projectResourceIncludeDirsRelation="-1"/>
+				<ExtraCommands>
+					<Mode before="always" />
+					<Add before="doxygen sdk.doxy"/>
+				</ExtraCommands>
+			</Target>
 			<Environment>
-				<Variable name="LIB_WXXRC" value="wx_gtk2_xrc-2.4"/>
+				<Variable name="LIB_WXXRC" value="wx_gtk2_xrc-2.6"/>
 			</Environment>
 		</Build>
 		<Compiler>
 			<Add option="-Wall"/>
 			<Add option="-g"/>
-			<Add option="`wx-config --cflags`"/>
+			<Add option="-pipe"/>
+			<Add option="-fno-pcc-struct-return"/>
+			<Add option="-fno-rtti"/>
+			<Add option="-fmessage-length=0"/>
+			<Add option="`wxgtk2-2.6-config --cflags`"/>
 			<Add directory="sdk/wxscintilla/include"/>
 		</Compiler>
 		<Linker>
-			<Add option="`wx-config --libs`"/>
+			<Add option="`wxgtk2-2.6-config --libs`"/>
 			<Add directory="sdk/tinyxml"/>
 		</Linker>
 		<Unit filename="devel/share/CodeBlocks/images/codecompletion/README.txt">
@@ -1052,12 +1072,78 @@
 			<Option link="0"/>
 			<Option target="plugin_CompilerGCC"/>
 		</Unit>
+		<Unit filename="plugins/compilergcc/resources/compiler_menu.xrc">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_CompilerGCC"/>
+		</Unit>
 		<Unit filename="plugins/compilergcc/resources/compiler_options.xrc">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
 			<Option link="0"/>
 			<Option target="plugin_CompilerGCC"/>
 		</Unit>
+		<Unit filename="plugins/compilergcc/resources/compiler_toolbar.xrc">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_CompilerGCC"/>
+		</Unit>
+		<Unit filename="plugins/compilergcc/resources/compiler_toolbar_16x16.xrc">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_CompilerGCC"/>
+		</Unit>
+		<Unit filename="plugins/compilergcc/resources/images/16x16/compile.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_CompilerGCC"/>
+		</Unit>
+		<Unit filename="plugins/compilergcc/resources/images/16x16/compilerun.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_CompilerGCC"/>
+		</Unit>
+		<Unit filename="plugins/compilergcc/resources/images/16x16/rebuild.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_CompilerGCC"/>
+		</Unit>
+		<Unit filename="plugins/compilergcc/resources/images/16x16/run.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_CompilerGCC"/>
+		</Unit>
+		<Unit filename="plugins/compilergcc/resources/images/compile.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_CompilerGCC"/>
+		</Unit>
+		<Unit filename="plugins/compilergcc/resources/images/compilerun.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_CompilerGCC"/>
+		</Unit>
+		<Unit filename="plugins/compilergcc/resources/images/rebuild.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_CompilerGCC"/>
+		</Unit>
+		<Unit filename="plugins/compilergcc/resources/images/run.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_CompilerGCC"/>
+		</Unit>
 		<Unit filename="plugins/debuggergdb/backtracedlg.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="plugin_DebuggerGDB"/>
@@ -1144,6 +1230,66 @@
 			<Option link="0"/>
 			<Option target="plugin_DebuggerGDB"/>
 		</Unit>
+		<Unit filename="plugins/debuggergdb/resources/images/16x16/dbgnext.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_DebuggerGDB"/>
+		</Unit>
+		<Unit filename="plugins/debuggergdb/resources/images/16x16/dbgrun.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_DebuggerGDB"/>
+		</Unit>
+		<Unit filename="plugins/debuggergdb/resources/images/16x16/dbgrunto.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_DebuggerGDB"/>
+		</Unit>
+		<Unit filename="plugins/debuggergdb/resources/images/16x16/dbgstep.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_DebuggerGDB"/>
+		</Unit>
+		<Unit filename="plugins/debuggergdb/resources/images/16x16/stop.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_DebuggerGDB"/>
+		</Unit>
+		<Unit filename="plugins/debuggergdb/resources/images/dbgnext.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_DebuggerGDB"/>
+		</Unit>
+		<Unit filename="plugins/debuggergdb/resources/images/dbgrun.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_DebuggerGDB"/>
+		</Unit>
+		<Unit filename="plugins/debuggergdb/resources/images/dbgrunto.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_DebuggerGDB"/>
+		</Unit>
+		<Unit filename="plugins/debuggergdb/resources/images/dbgstep.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_DebuggerGDB"/>
+		</Unit>
+		<Unit filename="plugins/debuggergdb/resources/images/stop.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="plugin_DebuggerGDB"/>
+		</Unit>
 		<Unit filename="plugins/defaultmimehandler/defaultmimehandler.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="plugin_DefMimeHandler"/>
@@ -1280,6 +1426,12 @@
 			<Option link="0"/>
 			<Option target="plugin_XPManifest"/>
 		</Unit>
+		<Unit filename="sdk.doxy">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="doc"/>
+		</Unit>
 		<Unit filename="sdk/Managers/Managers.cpp">
 			<Option compilerVar="CPP"/>
 			<Option target="sdk"/>
@@ -1930,6 +2082,12 @@
 			<Option link="0"/>
 			<Option target="sdk"/>
 		</Unit>
+		<Unit filename="sdk/resources/auto_detect_compilers.xrc">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="sdk"/>
+		</Unit>
 		<Unit filename="sdk/resources/configure_tools.xrc">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
@@ -2814,6 +2972,90 @@
 			<Option link="0"/>
 			<Option target="src"/>
 		</Unit>
+		<Unit filename="src/resources/images/16x16/editcopy.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="src"/>
+		</Unit>
+		<Unit filename="src/resources/images/16x16/editcut.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="src"/>
+		</Unit>
+		<Unit filename="src/resources/images/16x16/editpaste.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="src"/>
+		</Unit>
+		<Unit filename="src/resources/images/16x16/filefind.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="src"/>
+		</Unit>
+		<Unit filename="src/resources/images/16x16/filenew.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="src"/>
+		</Unit>
+		<Unit filename="src/resources/images/16x16/fileopen.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="src"/>
+		</Unit>
+		<Unit filename="src/resources/images/16x16/filesave.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="src"/>
+		</Unit>
+		<Unit filename="src/resources/images/16x16/folder.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="src"/>
+		</Unit>
+		<Unit filename="src/resources/images/16x16/folder_new.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="src"/>
+		</Unit>
+		<Unit filename="src/resources/images/16x16/folder_open.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="src"/>
+		</Unit>
+		<Unit filename="src/resources/images/16x16/newproject.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="src"/>
+		</Unit>
+		<Unit filename="src/resources/images/16x16/redo.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="src"/>
+		</Unit>
+		<Unit filename="src/resources/images/16x16/searchreplace.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="src"/>
+		</Unit>
+		<Unit filename="src/resources/images/16x16/undo.png">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="src"/>
+		</Unit>
 		<Unit filename="src/resources/images/ascii.png">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
@@ -3012,7 +3254,37 @@
 			<Option link="0"/>
 			<Option target="src"/>
 		</Unit>
+		<Unit filename="src/resources/imp_exp_config.xrc">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="src"/>
+		</Unit>
 		<Unit filename="src/resources/main_frame.xrc">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="src"/>
+		</Unit>
+		<Unit filename="src/resources/main_menu.xrc">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="src"/>
+		</Unit>
+		<Unit filename="src/resources/main_toolbar.xrc">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="src"/>
+		</Unit>
+		<Unit filename="src/resources/main_toolbar_16x16.xrc">
+			<Option compilerVar=""/>
+			<Option compile="0"/>
+			<Option link="0"/>
+			<Option target="src"/>
+		</Unit>
+		<Unit filename="src/resources/print_dialog.xrc">
 			<Option compilerVar=""/>
 			<Option compile="0"/>
 			<Option link="0"/>