From 4e4046f843559811f884839da99dd01c38750c52 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sun, 23 Sep 2012 11:41:59 +0200 Subject: [PATCH] HOWTO update --- HOWTO.txt | 12 ++++++++++-- README.txt | 2 +- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/HOWTO.txt b/HOWTO.txt index 4c17234f..0dfb5937 100644 --- a/HOWTO.txt +++ b/HOWTO.txt @@ -6,6 +6,10 @@ How to... 1.1 Windows: + NOTE: currently, there are some issues when compiling on Windows, connected mostly with + clashing macros defined in windows headers. Most probably, a special development package + will be provided, which will include MinGW, CMake and all necessary libraries. + 1. Download and install MinGW and MSYS: http://sourceforge.net/projects/mingw/files/Installer/mingw-get-inst/mingw-get-inst-20111118/ When installing, select all available components. @@ -13,7 +17,7 @@ How to... http://www.cmake.org/cmake/resources/software.html (the Windows zip file) Unpack the contents of the archive to where MinGW is installed (files from bin/ should go into bin/, etc.) 3. Download the following libraries, installing them in your MinGW directory like with CMake: - SDL >=1.2.10, SDL_imgage >= 1.2, SDL_ttf >= 2.0, libpng >= 1.2, GLEW >= 1.8.0 + SDL >=1.2.10, SDL_imgage >= 1.2, SDL_ttf >= 2.0, libpng >= 1.2, GLEW >= 1.8.0, Boost >= 1.51 (with filesystem) Note #1: For most libraries, you can download binary packages with compiled files. However, you must ensure that they work with MinGW as some are built with MSVC and may be incompatible. If that is the case, you should compile the libraries from sources @@ -59,6 +63,10 @@ Jak... 1.1 Windows: + UWAGA: obecnie występują problemy z kompilacją na Windowsie, głównie ze względu na konflikt w makrach, + jakie definiują nagłówki windowsowe. Najprawdopodobniej, zostanie wydana specjalna paczka + dla developerów, która będzie zawierała MinGW, CMake i wszystkie potrzebne biblioteki. + 1. Ściągamy i instalujemy MinGW i MSYS: http://sourceforge.net/projects/mingw/files/Installer/mingw-get-inst/mingw-get-inst-20111118/ Przy instalacji zaznaczamy wszystkie komponenty do instalacji. @@ -66,7 +74,7 @@ Jak... http://www.cmake.org/cmake/resources/software.html (plik zip dla Windowsa) Zip rozpakowujemy do katalogu, gdzie zainstalowany jest MinGW (pliki z bin/ mają trafić do bin/ itd.). 3. Ścągamy następujące biblioteki i instalujemy je tam, gdzie MinGW, podobnie jak z CMake: - SDL >= 1.2.10, SDL_image >= 1.2, SDL_ttf >= 2.0, libpng >= 1.2 + SDL >= 1.2.10, SDL_image >= 1.2, SDL_ttf >= 2.0, libpng >= 1.2, Boost >= 1.51 (wraz z filesystem) Uwaga #1: W większości wymienionych bibliotek można ściągnąć paczki binarne ze skompilowanymi plikami. Jednak musisz się upewnić, że pliki te będą współpracowały z MinGW, bo część z nich jest kompilowana MSVC i może być niezgodna. W takim wypadku, musisz skompilować bibliotekę diff --git a/README.txt b/README.txt index bcbf67c8..071444b1 100644 --- a/README.txt +++ b/README.txt @@ -10,7 +10,7 @@ The source code contained here was released by Epsitec -- the original creator o More information for developers can be found at developer wiki at: http://colobot.info/wiki. However, the freshest source of information is our IRC channel #colobot at pirc.pl. -This repository contains only the source code of the project. The game requires also data files which are available in separate packages, currently from http://colobot.info/files. The packages are named colobot-data-RRRR-MM-DD.zip. Make sure you have the latest package before compiling and running the code in repository. +This repository contains only the source code of the project. The game requires also data files which are available in separate packages, currently from http://colobot.info/files. The packages are named colobot-data-YYYY-MM-DD.zip. Make sure you have the latest package before compiling and running the code in repository. Status