diff options
author | krzys-h <krzys_h@interia.pl> | 2014-10-19 16:18:36 +0200 |
---|---|---|
committer | krzys-h <krzys_h@interia.pl> | 2014-10-19 16:18:36 +0200 |
commit | 0245fdc6c328edf65b4fd9f45be4f440ef92b6eb (patch) | |
tree | d8237bdeacdee273c2eabaefc14f21637c1f489a /src/app/main.cpp | |
parent | d7ef0a1a5f7cee44eb8faaafefb7bb78e69be1f6 (diff) | |
parent | 83abb8ca8e74176d64944e9681d74aa11ef6cdf9 (diff) | |
download | colobot-0245fdc6c328edf65b4fd9f45be4f440ef92b6eb.tar.gz colobot-0245fdc6c328edf65b4fd9f45be4f440ef92b6eb.tar.bz2 colobot-0245fdc6c328edf65b4fd9f45be4f440ef92b6eb.zip |
Merge branch 'dev-physfs' into dev
Conflicts:
src/app/app.cpp
Diffstat (limited to 'src/app/main.cpp')
-rw-r--r-- | src/app/main.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index 27952db..e30a83d 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -71,6 +71,7 @@ The current layout is the following: - src/script - link with the CBot library */ +#include "common/resources/resourcemanager.h" //! Entry point to the program extern "C" @@ -79,6 +80,7 @@ extern "C" int SDL_MAIN_FUNC(int argc, char *argv[]) { CLogger logger; // single istance of logger + CResourceManager manager(argv[0]); // Initialize static string arrays InitializeRestext(); |