Fixed codeblocks solution (removed project search, removed dead files, changed build dependencies)

git-svn-id: svn://svn.sphinxsearch.com/sphinx/trunk@4370 406a0c4d-033a-0410-8de8-e80135713968

codeblocks/indexer.cbp

@@ -45,16 +45,18 @@
 			<Add directory="../config/" />
 		</Compiler>
 		<Linker>
-			<Add library="pthread" />
-			<Add library="rt" />
 			<Add library="expat" />
-			<Add library="mysqlclient" />
+			<Add library="dl" />
+			<Add library="m" />
+			<Add library="z" />
+			<Add library="rt" />
+			<Add library="pthread" />
 		</Linker>
 		<Unit filename="../src/indexer.cpp" />
 		<Extensions>
 			<AutoVersioning>
 				<Scheme minor_max="10" build_max="0" rev_max="0" rev_rand_max="10" build_times_to_increment_minor="100" />
-				<Settings autoincrement="1" date_declarations="1" update_manifest="2" do_auto_increment="0" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="version.h" />
+				<Settings autoincrement="1" date_declarations="1" use_define="0" update_manifest="1" do_auto_increment="0" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="version.h" />
 				<Changes_Log show_changes_editor="0" app_title="released version %M.%m.%b of %p" changeslog_path="ChangesLog.txt" />
 				<Code header_guard="VERSION_H" namespace="AutoVersion" prefix="" />
 			</AutoVersioning>

codeblocks/indextool.cbp

@@ -44,16 +44,18 @@
 			<Add directory="../config/" />
 		</Compiler>
 		<Linker>
-			<Add library="pthread" />
 			<Add library="expat" />
-			<Add library="mysqlclient" />
+			<Add library="dl" />
+			<Add library="m" />
+			<Add library="z" />
 			<Add library="rt" />
+			<Add library="pthread" />
 		</Linker>
 		<Unit filename="../src/indextool.cpp" />
 		<Extensions>
 			<AutoVersioning>
 				<Scheme minor_max="10" build_max="0" rev_max="0" rev_rand_max="10" build_times_to_increment_minor="100" />
-				<Settings autoincrement="1" date_declarations="1" update_manifest="2" do_auto_increment="0" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="version.h" />
+				<Settings autoincrement="1" date_declarations="1" use_define="0" update_manifest="1" do_auto_increment="0" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="version.h" />
 				<Changes_Log show_changes_editor="0" app_title="released version %M.%m.%b of %p" changeslog_path="ChangesLog.txt" />
 				<Code header_guard="VERSION_H" namespace="AutoVersion" prefix="" />
 			</AutoVersioning>

codeblocks/libsphinx.cbp

@@ -74,7 +74,6 @@
 		<Unit filename="../src/sphinxstemcz.cpp" />
 		<Unit filename="../src/sphinxstemen.cpp" />
 		<Unit filename="../src/sphinxstemru.cpp" />
-		<Unit filename="../src/sphinxtimers.h" />
 		<Unit filename="../src/sphinxudf.c">
 			<Option compilerVar="CC" />
 		</Unit>
@@ -83,7 +82,7 @@
 		<Extensions>
 			<AutoVersioning>
 				<Scheme minor_max="10" build_max="0" rev_max="0" rev_rand_max="10" build_times_to_increment_minor="100" />
-				<Settings autoincrement="1" date_declarations="1" update_manifest="247" do_auto_increment="0" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="version.h" />
+				<Settings autoincrement="1" date_declarations="1" use_define="0" update_manifest="1" do_auto_increment="0" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="version.h" />
 				<Changes_Log show_changes_editor="0" app_title="released version %M.%m.%b of %p" changeslog_path="ChangesLog.txt" />
 				<Code header_guard="VERSION_H" namespace="AutoVersion" prefix="" />
 			</AutoVersioning>

codeblocks/search.cbp

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_project_file>
-	<FileVersion major="1" minor="6" />
-	<Project>
-		<Option title="search" />
-		<Option pch_mode="2" />
-		<Option compiler="gcc" />
-		<Build>
-			<Target title="Debug">
-				<Option output="./bin/Debug/search" prefix_auto="1" extension_auto="1" />
-				<Option object_output="./junk/Debug" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Option projectLinkerOptionsRelation="2" />
-				<Compiler>
-					<Add option="-Wall" />
-					<Add option="-g" />
-					<Add option="-O0" />
-				</Compiler>
-				<Linker>
-					<Add library="bin/Debug/libsphinx.a" />
-				</Linker>
-			</Target>
-			<Target title="Release">
-				<Option output="./bin/Release/search" prefix_auto="1" extension_auto="1" />
-				<Option object_output="./junk/Release" />
-				<Option type="1" />
-				<Option compiler="gcc" />
-				<Option projectLinkerOptionsRelation="2" />
-				<Compiler>
-					<Add option="-O3" />
-					<Add option="-Wall" />
-					<Add option="-DNDEBUG" />
-				</Compiler>
-				<Linker>
-					<Add option="-s" />
-					<Add library="bin/Release/libsphinx.a" />
-				</Linker>
-			</Target>
-		</Build>
-		<Compiler>
-			<Add option="-D_FILE_OFFSET_BITS=64" />
-			<Add option="-DHAVE_CONFIG_H" />
-			<Add directory="../config/" />
-		</Compiler>
-		<Linker>
-			<Add library="pthread" />
-			<Add library="rt" />
-			<Add library="expat" />
-			<Add library="mysqlclient" />
-		</Linker>
-		<Unit filename="../src/search.cpp" />
-		<Extensions>
-			<AutoVersioning>
-				<Scheme minor_max="10" build_max="0" rev_max="0" rev_rand_max="10" build_times_to_increment_minor="100" />
-				<Settings autoincrement="1" date_declarations="1" update_manifest="2" do_auto_increment="0" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="version.h" />
-				<Changes_Log show_changes_editor="0" app_title="released version %M.%m.%b of %p" changeslog_path="ChangesLog.txt" />
-				<Code header_guard="VERSION_H" namespace="AutoVersion" prefix="" />
-			</AutoVersioning>
-			<envvars />
-			<code_completion />
-			<debugger />
-		</Extensions>
-	</Project>
-</CodeBlocks_project_file>

codeblocks/searchd.cbp

@@ -12,7 +12,7 @@
 			<Clean command="$make -f $makefile clean$target" />
 			<DistClean command="$make -f $makefile distclean$target" />
 			<AskRebuildNeeded command="$make -q -f $makefile $target" />
-			<SilentBuild command="$make -s -f $makefile $target" />
+			<SilentBuild command="$make -f $makefile &gt; $(CMD_NULL)" />
 		</MakeCommands>
 		<Build>
 			<Target title="Debug">
@@ -71,16 +71,18 @@
 			<Add directory="../config/" />
 		</Compiler>
 		<Linker>
-			<Add library="pthread" />
-			<Add library="rt" />
 			<Add library="expat" />
-			<Add library="mysqlclient" />
+			<Add library="dl" />
+			<Add library="m" />
+			<Add library="z" />
+			<Add library="rt" />
+			<Add library="pthread" />
 		</Linker>
 		<Unit filename="../src/searchd.cpp" />
 		<Extensions>
 			<AutoVersioning>
 				<Scheme minor_max="10" build_max="0" rev_max="0" rev_rand_max="10" build_times_to_increment_minor="100" />
-				<Settings autoincrement="1" date_declarations="1" update_manifest="2" do_auto_increment="0" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="version.h" />
+				<Settings autoincrement="1" date_declarations="1" use_define="0" update_manifest="1" do_auto_increment="0" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="version.h" />
 				<Changes_Log show_changes_editor="0" app_title="released version %M.%m.%b of %p" changeslog_path="ChangesLog.txt" />
 				<Code header_guard="VERSION_H" namespace="AutoVersion" prefix="" />
 			</AutoVersioning>

codeblocks/testrt.cbp

@@ -44,16 +44,18 @@
 			<Add directory="../config/" />
 		</Compiler>
 		<Linker>
-			<Add library="pthread" />
-			<Add library="rt" />
 			<Add library="expat" />
-			<Add library="mysqlclient" />
+			<Add library="dl" />
+			<Add library="m" />
+			<Add library="z" />
+			<Add library="rt" />
+			<Add library="pthread" />
 		</Linker>
 		<Unit filename="../src/testrt.cpp" />
 		<Extensions>
 			<AutoVersioning>
 				<Scheme minor_max="10" build_max="0" rev_max="0" rev_rand_max="10" build_times_to_increment_minor="100" />
-				<Settings autoincrement="1" date_declarations="1" update_manifest="2" do_auto_increment="0" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="version.h" />
+				<Settings autoincrement="1" date_declarations="1" use_define="0" update_manifest="1" do_auto_increment="0" ask_to_increment="0" language="C++" svn="0" svn_directory="" header_path="version.h" />
 				<Changes_Log show_changes_editor="0" app_title="released version %M.%m.%b of %p" changeslog_path="ChangesLog.txt" />
 				<Code header_guard="VERSION_H" namespace="AutoVersion" prefix="" />
 			</AutoVersioning>

sphinx.workspace

@@ -1,27 +1,24 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
-<CodeBlocks_workspace_file>
-	<Workspace title="Sphinx">
-		<Project filename="codeblocks/libsphinx.cbp" />
-		<Project filename="codeblocks/indexer.cbp">
-			<Depends filename="codeblocks/libsphinx.cbp" />
-		</Project>
-		<Project filename="codeblocks/indextool.cbp">
-			<Depends filename="codeblocks/libsphinx.cbp" />
-		</Project>
-		<Project filename="codeblocks/search.cbp">
-			<Depends filename="codeblocks/libsphinx.cbp" />
-		</Project>
-		<Project filename="codeblocks/searchd.cbp" active="1">
-			<Depends filename="codeblocks/libsphinx.cbp" />
-		</Project>
-		<Project filename="codeblocks/spelldump.cbp">
-			<Depends filename="codeblocks/libsphinx.cbp" />
-		</Project>
-		<Project filename="codeblocks/tests.cbp">
-			<Depends filename="codeblocks/libsphinx.cbp" />
-		</Project>
-		<Project filename="codeblocks/testrt.cbp">
-			<Depends filename="codeblocks/libsphinx.cbp" />
-		</Project>
-	</Workspace>
-</CodeBlocks_workspace_file>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_workspace_file>
+	<Workspace title="Sphinx">
+		<Project filename="codeblocks/libsphinx.cbp" />
+		<Project filename="codeblocks/indexer.cbp">
+			<Depends filename="codeblocks/libsphinx.cbp" />
+		</Project>
+		<Project filename="codeblocks/indextool.cbp">
+			<Depends filename="codeblocks/libsphinx.cbp" />
+		</Project>
+		<Project filename="codeblocks/searchd.cbp">
+			<Depends filename="codeblocks/libsphinx.cbp" />
+		</Project>
+		<Project filename="codeblocks/spelldump.cbp">
+			<Depends filename="codeblocks/libsphinx.cbp" />
+		</Project>
+		<Project filename="codeblocks/tests.cbp">
+			<Depends filename="codeblocks/libsphinx.cbp" />
+		</Project>
+		<Project filename="codeblocks/testrt.cbp">
+			<Depends filename="codeblocks/libsphinx.cbp" />
+		</Project>
+	</Workspace>
+</CodeBlocks_workspace_file>