# HG changeset patch
# User jose1711
# Date 1353756757 -3600
# Node ID 0f6122422240edf81d3dd873446b0d608d8705e1
# Parent  b0ccf8d1364513f4730317778a096650d5ea4d61# Parent  67c3201365b139f2f722ec8c891f1a272b20be31
merge

diff -r b0ccf8d13645 -r 0f6122422240 INSTALL
--- a/INSTALL	Fri Nov 23 23:27:34 2012 +0100
+++ b/INSTALL	Sat Nov 24 12:32:37 2012 +0100
@@ -1,13 +1,14 @@
 To compile and install you need:
- - Qt >= 4.5
- - FreePascal >= 2.2.4
+ - CMake >= 2.6.0
+ - FreePascal >= 2.2.0
+ - Qt >= 4.5.0
  - SDL >= 1.2.5
  - SDL_net >= 1.2.5
  - SDL_mixer >= 1.2
  - SDL_image >= 1.2
  - SDL_ttf >= 2.0
- - CMake >= 2.6.0
  - Lua >= 5.1.0
+ - Physfs >= 2.0
 For server:
  - Glasgow Haskell Compiler >= 6.10
  - bytestring-show package
@@ -16,6 +17,11 @@
 For videorecording:
  - FFmpeg or LibAV
  - GLUT (when SDL < 2)
+For compressed screenshots:
+ - libpng
+
+Lua and Physfs will be automatically built if not found.
+
 
 1. Configure:
 $ cmake .
@@ -23,8 +29,12 @@
 $ cmake -DCMAKE_BUILD_TYPE="Release" -DCMAKE_INSTALL_PREFIX="install_prefix" \
 -DDATA_INSTALL_DIR="data_dir" -DNOSERVER=1 .
 
-add -DNOSERVER=0 to compile net server; if you have Qt installed but it is
-not found you can set it up with -DQT_QMAKE_EXECUTABLE="path_to_qmake"
+Add -DNOSERVER=0 to compile net server (remember to check out the additional
+dependencies with the hedgewars-server.cabal configuration file. If you have
+Qt installed but it is not found, you can set it up with
+-DQT_QMAKE_EXECUTABLE="path_to_qmake".
+To get a glimpse of the main configuration options, you may use this command
+`cat CMakeLists.txt | grep option`
 
 2. Compile:
 $ make
@@ -34,3 +44,4 @@
 
 
 That's all! Enjoy!
+
diff -r b0ccf8d13645 -r 0f6122422240 README
--- a/README	Fri Nov 23 23:27:34 2012 +0100
+++ b/README	Sat Nov 24 12:32:37 2012 +0100
@@ -5,3 +5,10 @@
 Source:
 Copyright 2004-2011 Andrey Korotaev <unC0Rr@gmail.com>
 Portions copyright 2006-2008 Igor Ulyanov aka Displacer <iulyanov@gmail.com>
+
+Instructions:
+depending on your system, consult our wiki at:
+- http://code.google.com/p/hedgewars/wiki/BuildingOnLinux
+- http://code.google.com/p/hedgewars/wiki/BuildingOnWindows
+- http://code.google.com/p/hedgewars/wiki/BuildingOnMac
+
diff -r b0ccf8d13645 -r 0f6122422240 README_WINDOWS
--- a/README_WINDOWS	Fri Nov 23 23:27:34 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-For instructions, please visit: http://code.google.com/p/hedgewars/wiki/BuildingOnWindows
diff -r b0ccf8d13645 -r 0f6122422240 misc/physfs/CMakeLists.txt
--- a/misc/physfs/CMakeLists.txt	Fri Nov 23 23:27:34 2012 +0100
+++ b/misc/physfs/CMakeLists.txt	Sat Nov 24 12:32:37 2012 +0100
@@ -47,7 +47,7 @@
 
     # Need these everywhere...
     ADD_DEFINITIONS(-fno-common)
-    SET(OTHER_LDFLAGS ${OTHER_LDFLAGS} "-framework Carbon -framework IOKit")
+    SET(OTHER_LDFLAGS ${OTHER_LDFLAGS} "-framework IOKit")
 ENDIF(MACOSX)
 
 # Add some gcc-specific command lines.
diff -r b0ccf8d13645 -r 0f6122422240 misc/physfs/extras/hwpacksmounter.c
--- a/misc/physfs/extras/hwpacksmounter.c	Fri Nov 23 23:27:34 2012 +0100
+++ b/misc/physfs/extras/hwpacksmounter.c	Sat Nov 24 12:32:37 2012 +0100
@@ -1,11 +1,10 @@
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include "physfs.h"
 
 #include "hwpacksmounter.h"
 
-void hedgewarsMountPackages()
+PHYSFS_DECL void hedgewarsMountPackages()
 {
     char ** filesList = PHYSFS_enumerateFiles("/");
     char **i;
diff -r b0ccf8d13645 -r 0f6122422240 misc/physfs/extras/hwpacksmounter.h
--- a/misc/physfs/extras/hwpacksmounter.h	Fri Nov 23 23:27:34 2012 +0100
+++ b/misc/physfs/extras/hwpacksmounter.h	Sat Nov 24 12:32:37 2012 +0100
@@ -1,11 +1,13 @@
 #ifndef HEDGEWARS_PACKAGES_MOUNTER_H
 #define HEDGEWARS_PACKAGES_MOUNTER_H
 
+#include "physfs.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-void hedgewarsMountPackages();
+PHYSFS_DECL void hedgewarsMountPackages();
 
 
 #ifdef __cplusplus
diff -r b0ccf8d13645 -r 0f6122422240 misc/physfs/extras/physfslualoader.c
--- a/misc/physfs/extras/physfslualoader.c	Fri Nov 23 23:27:34 2012 +0100
+++ b/misc/physfs/extras/physfslualoader.c	Sat Nov 24 12:32:37 2012 +0100
@@ -5,7 +5,7 @@
 
 void *physfsReaderBuffer;
 
-const char * physfsReader(lua_State *L, PHYSFS_File *f, size_t *size)
+PHYSFS_DECL const char * physfsReader(lua_State *L, PHYSFS_File *f, size_t *size)
 {
 
     if(PHYSFS_eof(f))
@@ -23,7 +23,7 @@
     }
 }
 
-void physfsReaderSetBuffer(void *buffer)
+PHYSFS_DECL void physfsReaderSetBuffer(void *buffer)
 {
     physfsReaderBuffer = buffer;
 }