Author: anonymissimus
Date: Sun Jun 12 00:52:23 2011
New Revision: 49845
URL: http://svn.gna.org/viewcvs/wesnoth?rev=49845&view=rev
Log:
updated CodeBlocks project file
(I should upload my updated headers/lib package too...)
Modified:
trunk/projectfiles/CodeBlocks/liblua.cbp
trunk/projectfiles/CodeBlocks/wesnoth.cbp
trunk/projectfiles/CodeBlocks/wesnoth.workspace
trunk/projectfiles/CodeBlocks/wesnothd.cbp
Modified: trunk/projectfiles/CodeBlocks/liblua.cbp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/projectfiles/CodeBlocks/liblua.cbp?rev=49845&r1=49844&r2=49845&view=diff
==============================================================================
--- trunk/projectfiles/CodeBlocks/liblua.cbp (original)
+++ trunk/projectfiles/CodeBlocks/liblua.cbp Sun Jun 12 00:52:23 2011
@@ -14,7 +14,6 @@
<Option compiler="gcc" />
<Option createDefFile="1" />
<Compiler>
- <Add option="-Wall" />
<Add option="-g" />
</Compiler>
</Target>
@@ -26,15 +25,12 @@
<Option compiler="gcc" />
<Option createDefFile="1" />
<Compiler>
- <Add option="-Wall" />
- <Add option="-O2" />
+ <Add option="-O3" />
</Compiler>
- <Linker>
- <Add option="-s" />
- </Linker>
</Target>
</Build>
<Compiler>
+ <Add option="-Wall" />
<Add directory="..\..\src" />
</Compiler>
<Unit filename="..\..\src\lua\lapi.c">
Modified: trunk/projectfiles/CodeBlocks/wesnoth.cbp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/projectfiles/CodeBlocks/wesnoth.cbp?rev=49845&r1=49844&r2=49845&view=diff
==============================================================================
--- trunk/projectfiles/CodeBlocks/wesnoth.cbp (original)
+++ trunk/projectfiles/CodeBlocks/wesnoth.cbp Sun Jun 12 00:52:23 2011
@@ -12,6 +12,9 @@
<Option object_output=".objs-release" />
<Option type="0" />
<Option compiler="gcc" />
+ <Compiler>
+ <Add option="-O3" />
+ </Compiler>
</Target>
<Target title="Debug">
<Option output="..\..\wesnoth-debug"
prefix_auto="1" extension_auto="1" />
@@ -25,11 +28,13 @@
</Target>
</Build>
<Compiler>
- <Add option="-O3" />
<Add option="-Wall" />
<Add option="-mthreads" />
<Add option="-march=native" />
<Add option="-fexceptions" />
+ <Add option="-fdiagnostics-show-option" />
+ <Add option="-Wno-strict-aliasing" />
+ <Add option="-fopenmp" />
<Add option="-DHAVE_PYTHON" />
<Add option="-DUSE_GZIP" />
<Add directory="..\..\src" />
@@ -39,6 +44,7 @@
</Compiler>
<Linker>
<Add option="-mthreads" />
+ <Add option="-fopenmp" />
<Add library="mingwthrd" />
<Add library="mingw32" />
<Add library="SDLmain" />
@@ -49,13 +55,8 @@
<Add library="SDL_ttf" />
<Add library="freetype" />
<Add library="intl" />
- <Add library="python25" />
- <Add library="png" />
- <Add library="boost_iostreams_dw2" />
- <Add library="boost_regex_dw2" />
<Add library="z" />
<Add library="ws2_32" />
- <Add library="jpeg" />
<Add library="pango-1.0" />
<Add library="pangocairo-1.0" />
<Add library="cairo" />
@@ -63,6 +64,11 @@
<Add library="fontconfig" />
<Add library="libglib-2.0" />
<Add library="liblua" />
+ <Add library="libboost_iostreams" />
+ <Add library="libz" />
+ <Add library="libboost_regex" />
+ <Add library="libboost_program_options" />
+ <Add library="pthread" />
<Add directory=".\" />
</Linker>
<Unit filename="..\..\packaging\windows\wesnoth.rc">
Modified: trunk/projectfiles/CodeBlocks/wesnoth.workspace
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/projectfiles/CodeBlocks/wesnoth.workspace?rev=49845&r1=49844&r2=49845&view=diff
==============================================================================
--- trunk/projectfiles/CodeBlocks/wesnoth.workspace (original)
+++ trunk/projectfiles/CodeBlocks/wesnoth.workspace Sun Jun 12 00:52:23 2011
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_workspace_file>
<Workspace title="Wesnoth Workspace">
+ <Project filename="liblua.cbp" />
<Project filename="wesnoth.cbp" active="1">
<Depends filename="liblua.cbp" />
</Project>
<Project filename="wesnothd.cbp">
<Depends filename="liblua.cbp" />
</Project>
- <Project filename="liblua.cbp" />
</Workspace>
</CodeBlocks_workspace_file>
Modified: trunk/projectfiles/CodeBlocks/wesnothd.cbp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/projectfiles/CodeBlocks/wesnothd.cbp?rev=49845&r1=49844&r2=49845&view=diff
==============================================================================
--- trunk/projectfiles/CodeBlocks/wesnothd.cbp (original)
+++ trunk/projectfiles/CodeBlocks/wesnothd.cbp Sun Jun 12 00:52:23 2011
@@ -12,6 +12,9 @@
<Option object_output=".objs-release" />
<Option type="1" />
<Option compiler="gcc" />
+ <Compiler>
+ <Add option="-O3" />
+ </Compiler>
</Target>
<Target title="Debug">
<Option output="..\..\wesnothd-debug"
prefix_auto="1" extension_auto="1" />
@@ -25,11 +28,12 @@
</Target>
</Build>
<Compiler>
- <Add option="-O3" />
<Add option="-Wall" />
<Add option="-mthreads" />
<Add option="-fexceptions" />
<Add option="-march=native" />
+ <Add option="-fdiagnostics-show-option" />
+ <Add option="-fopenmp" />
<Add option="-DHAVE_PYTHON" />
<Add option="-DUSE_GZIP" />
<Add directory="..\..\src" />
@@ -38,11 +42,12 @@
</Compiler>
<Linker>
<Add option="-mthreads" />
+ <Add option="-fopenmp" />
<Add library="mingw32" />
<Add library="mingwthrd" />
<Add library="SDLmain" />
<Add library="SDL" />
- <Add library="boost_iostreams_dw2" />
+ <Add library="boost_iostreams" />
<Add library="intl" />
<Add library="SDL_net" />
<Add library="ws2_32" />
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
