Skip to content

Commit

Permalink
Fixed codeblocks solution (removed project search, removed dead files…
Browse files Browse the repository at this point in the history 
…, changed build dependencies)

git-svn-id: svn://svn.sphinxsearch.com/sphinx/trunk@4370 406a0c4d-033a-0410-8de8-e80135713968
  • Loading branch information
klirichek committed Nov 27, 2013
1 parent baf9d92 commit 25fa5c2
Show file tree
Hide file tree
Showing 7 changed files with 49 additions and 110 deletions.
10 changes: 6 additions & 4 deletions codeblocks/indexer.cbp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
8 changes: 5 additions & 3 deletions codeblocks/indextool.cbp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions codeblocks/libsphinx.cbp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
65 changes: 0 additions & 65 deletions codeblocks/search.cbp
View file

This file was deleted.

12 changes: 7 additions & 5 deletions codeblocks/searchd.cbp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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>
Expand Down
10 changes: 6 additions & 4 deletions codeblocks/testrt.cbp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
51 changes: 24 additions & 27 deletions sphinx.workspace
View file
Original file line number Diff line number Diff line change
@@ -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>

0 comments on commit 25fa5c2

Please sign in to comment.