[escape-from-the-masters-lair] push by DarkOppr...@gmail.com - Updated the Linux stuff. on 2011-04-21 07:29 GMT

0 views
Skip to first unread message

escape-from-th...@googlecode.com

unread,
Apr 21, 2011, 3:29:48 AM4/21/11
to escape-from-th...@googlegroups.com
Revision: 041c6602467a
Author: Kevin Wells <DarkOp...@gmail.com>
Date: Thu Apr 21 00:29:03 2011
Log: Updated the Linux stuff.
http://code.google.com/p/escape-from-the-masters-lair/source/detail?r=041c6602467a

Added:
/docs/readme
Modified:
/Escape from the Master's Lair.cbp
/Escape from the Master's Lair.layout
/game_window.cpp
/version.h

=======================================
--- /dev/null
+++ /docs/readme Thu Apr 21 00:29:03 2011
@@ -0,0 +1,3 @@
+For Windows, run Escape.exe
+
+For Linux, run ./Escape
=======================================
--- /Escape from the Master's Lair.cbp Tue Apr 19 12:07:59 2011
+++ /Escape from the Master's Lair.cbp Thu Apr 21 00:29:03 2011
@@ -8,21 +8,21 @@
<Build>
<Target title="Release-Windows">
<Option platforms="Windows;" />
- <Option output="bin\Release-Windows\Escape.exe" prefix_auto="1"
extension_auto="0" />
+ <Option output="bin/Release-Windows/Escape.exe" prefix_auto="1"
extension_auto="0" />
<Option working_dir="" />
- <Option object_output="obj\Release-Windows\" />
+ <Option object_output="obj/Release-Windows/" />
<Option type="5" />
<Option compiler="gcc" />
<Compiler>
<Add option="-O2" />
<Add option="-w" />
- <Add directory="..\..\MinGW\include" />
- <Add directory="..\..\SDL\include\SDL" />
- <Add directory="..\..\SDL\SDL_image\include" />
- <Add directory="..\..\SDL\SDL_gfx\include" />
- <Add directory="..\..\SDL\SDL_mixer\include" />
- <Add directory="..\..\glew\include\GL" />
- <Add directory="..\..\Boost" />
+ <Add directory="../../MinGW/include" />
+ <Add directory="../../SDL/include/SDL" />
+ <Add directory="../../SDL/SDL_image/include" />
+ <Add directory="../../SDL/SDL_gfx/include" />
+ <Add directory="../../SDL/SDL_mixer/include" />
+ <Add directory="../../glew/include/GL" />
+ <Add directory="../../Boost" />
</Compiler>
<Linker>
<Add option="-s" />
@@ -32,21 +32,21 @@
<Add option="-lSDL" />
<Add option="-mwindows" />
<Add option="-Wl,--stack,16777216" />
- <Add library="..\..\SDL\lib\libSDL.dll.a" />
- <Add library="..\..\SDL\lib\libSDLmain.a" />
- <Add library="..\..\glew\lib\glew32s.lib" />
- <Add library="..\..\MinGW\lib\libopengl32.a" />
- <Add library="..\..\MinGW\lib\libglu32.a" />
- <Add library="..\..\SDL\SDL_image\lib\SDL_image.lib" />
- <Add library="..\..\SDL\SDL_gfx\lib\libSDL_gfx.dll.a" />
- <Add library="..\..\SDL\SDL_mixer\lib\SDL_mixer.lib" />
- <Add
library="..\..\Boost\stage\lib\libboost_system-mgw45-mt-1_46_1.a" />
- <Add
library="..\..\Boost\stage\lib\libboost_filesystem-mgw45-mt-1_46_1.a" />
- <Add
library="..\..\Boost\stage\lib\libboost_iostreams-mgw45-mt-1_46_1.a" />
- <Add library="..\..\Boost\stage\lib\libboost_bzip2-mgw45-mt-1_46_1.a"
/>
- <Add directory="..\..\SDL\lib" />
- <Add directory="..\..\glew\lib" />
- <Add directory="..\..\Boost\stage\lib" />
+ <Add library="../../SDL/lib/libSDL.dll.a" />
+ <Add library="../../SDL/lib/libSDLmain.a" />
+ <Add library="../../glew/lib/glew32s.lib" />
+ <Add library="../../MinGW/lib/libopengl32.a" />
+ <Add library="../../MinGW/lib/libglu32.a" />
+ <Add library="../../SDL/SDL_image/lib/SDL_image.lib" />
+ <Add library="../../SDL/SDL_gfx/lib/libSDL_gfx.dll.a" />
+ <Add library="../../SDL/SDL_mixer/lib/SDL_mixer.lib" />
+ <Add
library="../../Boost/stage/lib/libboost_system-mgw45-mt-1_46_1.a" />
+ <Add
library="../../Boost/stage/lib/libboost_filesystem-mgw45-mt-1_46_1.a" />
+ <Add
library="../../Boost/stage/lib/libboost_iostreams-mgw45-mt-1_46_1.a" />
+ <Add library="../../Boost/stage/lib/libboost_bzip2-mgw45-mt-1_46_1.a"
/>
+ <Add directory="../../SDL/lib" />
+ <Add directory="../../glew/lib" />
+ <Add directory="../../Boost/stage/lib" />
</Linker>
</Target>
<Target title="Release-Linux">
@@ -56,43 +56,31 @@
<Option type="5" />
<Option compiler="gcc" />
<Compiler>
- <Add option="-O2" />
- <Add option="-D__CONSOLE_MODE" />
- <Add directory="..\..\MinGW\include" />
- <Add directory="..\..\SDL\include\SDL" />
- <Add directory="..\..\SDL\SDL_image\include" />
- <Add directory="..\..\SDL\SDL_gfx\include" />
- <Add directory="..\..\SDL\SDL_mixer\include" />
- <Add directory="..\..\glew\include\GL" />
- <Add directory="..\..\Boost" />
- <Add directory="..\..\PDCurses-SO" />
- <Add directory="..\..\PDCurses-SO\win32" />
+ <Add option="-fexpensive-optimizations" />
+ <Add option="-O3" />
+ <Add option="-w" />
+ <Add directory="/usr/include/SDL/" />
+ <Add directory="/usr/include/" />
+ <Add directory="/usr/include/GL/" />
+ <Add directory="../../boost" />
</Compiler>
<Linker>
<Add option="-s" />
- <Add option="-lws2_32" />
- <Add option="-lmingw32" />
<Add option="-lSDLmain" />
<Add option="-lSDL" />
- <Add option="-mwindows" />
- <Add option="-Wl,--stack,16777216" />
- <Add library="..\..\SDL\lib\libSDL.dll.a" />
- <Add library="..\..\SDL\lib\libSDLmain.a" />
- <Add library="..\..\glew\lib\glew32s.lib" />
- <Add library="..\..\MinGW\lib\libopengl32.a" />
- <Add library="..\..\MinGW\lib\libglu32.a" />
- <Add library="..\..\SDL\SDL_image\lib\SDL_image.lib" />
- <Add library="..\..\SDL\SDL_gfx\lib\libSDL_gfx.dll.a" />
- <Add library="..\..\SDL\SDL_mixer\lib\SDL_mixer.lib" />
- <Add
library="..\..\Boost\stage\lib\libboost_system-mgw45-mt-1_46_1.a" />
- <Add
library="..\..\Boost\stage\lib\libboost_filesystem-mgw45-mt-1_46_1.a" />
- <Add
library="..\..\Boost\stage\lib\libboost_iostreams-mgw45-mt-1_46_1.a" />
- <Add library="..\..\Boost\stage\lib\libboost_bzip2-mgw45-mt-1_46_1.a"
/>
- <Add library="..\..\PDCurses-SO\win32\panel.a" />
- <Add library="..\..\PDCurses-SO\win32\pdcurses.a" />
- <Add directory="..\..\SDL\lib" />
- <Add directory="..\..\glew\lib" />
- <Add directory="..\..\Boost\stage\lib" />
+ <Add library="/usr/lib64/libSDL.so" />
+ <Add library="/usr/lib64/libSDLmain.a" />
+ <Add library="/usr/lib64/libGLEW.so" />
+ <Add library="/usr/lib64/libGL.so" />
+ <Add library="/usr/lib64/libGLU.so" />
+ <Add library="/usr/lib64/libSDL_image.so" />
+ <Add library="/usr/lib64/libSDL_gfx.so" />
+ <Add library="/usr/lib64/libSDL_mixer.so" />
+ <Add library="../../boost/stage/lib/libboost_system.so" />
+ <Add library="../../boost/stage/lib/libboost_filesystem.so" />
+ <Add library="../../boost/stage/lib/libboost_iostreams.so" />
+ <Add directory="/usr/lib64/" />
+ <Add directory="../../boost/stage/lib" />
</Linker>
</Target>
</Build>
=======================================
--- /Escape from the Master's Lair.layout Wed Apr 20 23:17:34 2011
+++ /Escape from the Master's Lair.layout Thu Apr 21 00:29:03 2011
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_layout_file>
- <ActiveTarget name="Release-Windows" />
+ <ActiveTarget name="Release-Linux" />
<File name="MersenneTwister.h" open="0" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="14358" topLine="427" />
</File>
@@ -109,8 +109,8 @@
<File name="game.h" open="0" top="0" tabpos="4" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="724" topLine="33" />
</File>
- <File name="game_window.cpp" open="1" top="1" tabpos="2" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="3176" topLine="88" />
+ <File name="game_window.cpp" open="0" top="0" tabpos="2" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="3026" topLine="85" />
</File>
<File name="game_window.h" open="0" top="0" tabpos="3" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="390" topLine="0" />
@@ -169,8 +169,8 @@
<File name="light_data.h" open="0" top="0" tabpos="0" split="0"
active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="132" topLine="0" />
</File>
- <File name="main.cpp" open="0" top="0" tabpos="1" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="7046" topLine="161" />
+ <File name="main.cpp" open="1" top="0" tabpos="1" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="6783" topLine="152" />
</File>
<File name="main.h" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="198" topLine="0" />
@@ -214,8 +214,8 @@
<File name="pixels.h" open="0" top="0" tabpos="0" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="132" topLine="0" />
</File>
- <File name="player.cpp" open="1" top="0" tabpos="1" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
- <Cursor1 position="3234" topLine="126" />
+ <File name="player.cpp" open="1" top="1" tabpos="2" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
+ <Cursor1 position="41894" topLine="1009" />
</File>
<File name="player.h" open="0" top="0" tabpos="7" split="0" active="1"
splitpos="0" zoom_1="0" zoom_2="0">
<Cursor1 position="995" topLine="22" />
=======================================
--- /game_window.cpp Wed Apr 20 23:17:34 2011
+++ /game_window.cpp Thu Apr 21 00:29:03 2011
@@ -103,6 +103,8 @@

///player.option_screen_width=SDL_GetVideoInfo()->current_w;
///player.option_screen_height=SDL_GetVideoInfo()->current_h;
+
+ return true;
}

bool Game_Window::init(){
=======================================
--- /version.h Wed Apr 20 23:17:34 2011
+++ /version.h Thu Apr 21 00:29:03 2011
@@ -16,17 +16,17 @@
//Standard Version Type
static const long MAJOR = 0;
static const long MINOR = 4;
- static const long BUILD = 3071;
- static const long REVISION = 17040;
+ static const long BUILD = 3075;
+ static const long REVISION = 17061;

//Miscellaneous Version Types
- static const long BUILDS_COUNT = 7217;
- #define RC_FILEVERSION 0,4,3071,17040
- #define RC_FILEVERSION_STRING "0, 4, 3071, 17040\0"
- static const char FULLVERSION_STRING[] = "0.4.3071.17040";
+ static const long BUILDS_COUNT = 7232;
+ #define RC_FILEVERSION 0,4,3075,17061
+ #define RC_FILEVERSION_STRING "0, 4, 3075, 17061\0"
+ static const char FULLVERSION_STRING[] = "0.4.3075.17061";

//These values are to keep track of your versioning state, don't modify
them.
- static const long BUILD_HISTORY = 11;
+ static const long BUILD_HISTORY = 15;


}

Reply all
Reply to author
Forward
0 new messages