This file is larger than 256 KB, so syntax highlighting was skipped.
diff --git a/README b/README
index 1e8bd49..1daf991 100644
--- a/README
+++ b/README
@@ -1,64 +1,76 @@
Me and My Shadow
====================
Me and My Shadow is a free libre puzzle/platform game in which you try to reach
the exit by solving puzzles. Spikes, moving blocks, fragile blocks and much
more stand between you and the exit. Record your moves and let your shadow
mimic them to reach blocks you couldn't reach alone.
- Tutorial for beginners
- 2 level packs containing over 40 levels
- 18 different block types
- Built-in level editor
- Easily installable addons
- Original music by Juho-Petteri Yliuntinen
- Cross platform
Compiling on Linux
====================
You will need the following packages (and their -dev(el) files) to be installed:
* libSDL
* libSDL_image
* libSDL_ttf
* libSDL_mixer
* libSDL_gfx
* libcurl
* libarchive
* cmake
* C++ compiler (found in packages like g++, gcc-c++, gcc)
The process is simple. Enter a terminal and move to directory containing
MeAndMyShadow. Then just type
cmake .
to generate the Makefile. If everything configured properly you don't see any
errors and then you can start compiling by typing
make
Finally you can run MeAndMyShadow with
./meandmyshadow
To install MeAndMyShadow on your system, run following as root
make install
Compiling without GL
====================
In some cases you might want to compile Me and My Shadow without openGL
hardware accelaration. In order to do this follow the steps above but replace the
cmake call with:
cmake -DHARDWARE_ACCELERATION=OFF .
Note that you can always run Me and My Shadow in SDL mode by setting gl to 0 in
the config file or by running it as following:
- meandmyshadow -set gl 0
\ No newline at end of file
+ meandmyshadow -set gl 0
+
+Compiling on Mac
+====================
+You need to have Xcode 4+ and following frameworks:
+
+ * SDL.framework
+ * SDL_image.framework
+ * SDL_ttf.framewrok
+ * SDL_mixer.framework
+ * SDL_gfx.framework
+
+Offical SDL binaries builded not builded for embeding with app. So you need to build them from sources or use unofficial binaries, please refer to this article: http://thirdcog.eu/apps/frameworks
diff --git a/src/Addons.cpp b/src/Addons.cpp
index 5610edd..3332967 100644
--- a/src/Addons.cpp
+++ b/src/Addons.cpp
@@ -1,603 +1,609 @@
/*
* Copyright (C) 2011-2012 Me and My Shadow
*
* This file is part of Me and My Shadow.
*
* Me and My Shadow is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Me and My Shadow is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with Me and My Shadow. If not, see <http://www.gnu.org/licenses/>.
cerr<<"ERROR: Unable to move levelpack directory "<<(getUserPath(USER_DATA)+"custom/levelpacks/"+packName)<<" to "<<(getUserPath(USER_DATA)+"custom/levelpacks/"+GUIObjectRoot->childControls[i]->caption)<<endl;