Mikhail Paulyshka
2047a66bd9
install MSVC runtime
...
copy libEGL and libGLESv2 only for MSVC
2014-10-12 18:03:47 +03:00
Mikhail Paulyshka
dcba7a6316
move minizip detection to module
2014-10-12 16:50:39 +03:00
Mikhail Paulyshka
fff8e10a63
copy libEGL and libGLESv2 for MSVC build
...
copy debug version of Qt libraries when build type is debug for MinGW
2014-10-12 16:40:24 +03:00
Mikhail Paulyshka
514045b259
add settings for MSVC
...
small reorganizing in /CMakeLists.txt
2014-10-12 16:38:53 +03:00
Mikhail Paulyshka
53e2719ca4
update cotire
2014-10-12 16:37:10 +03:00
josch
9bef590960
use system version of minizip
2014-09-02 17:00:20 +02:00
beegee1
12126754fb
- added all SDL2 directories to CMake (in case if any SDL2 module is installed somewhere else)
2014-08-04 20:35:23 +02:00
Ivan Savenko
c23261ac0a
Removed references to WoG files from CMake
2014-07-26 11:51:44 +03:00
Ivan Savenko
4fca583062
Merge pull request #29 from Mixaill/nsis
...
CMake: add NSIS generator settings
2014-07-18 00:56:46 +03:00
Michael Pavlyshko
a6e590f220
cpack/nsis: do not strip files
2014-07-17 23:11:09 +03:00
NikolayIT
3d3713ae7f
Added optimization flag (-O1) for the GCC compiler on Windows platform to prevent "CGameState.cpp.obj: too many sections" compile error
2014-07-16 11:37:57 +03:00
Michael Pavlyshko
88316f93d1
add NSIS generator settings
2014-07-14 01:23:57 +03:00
Michael Pavlyshko
83aff2d68e
* remove static linking for libgcc
...
* fix clang warnings
2014-07-12 14:10:44 +03:00
Michael Pavlyshko
3b461cfa02
disable one more warning (type-limits)
2014-07-11 22:54:50 +03:00
Michael Pavlyshko
2145eae128
disable one more warning (strict-aliasing)
2014-07-11 21:35:19 +03:00
Michael Pavlyshko
dbb8b6636f
Add -Wno-unused-local-typedefs instead of suppress all warnings
2014-07-11 18:26:22 +03:00
Michael Pavlyshko
699919a251
* link VCMI with libgcc statically
...
* copy winpthread to install folder
* copy libgcc to install folder because Qt5 linked with libgcc dynamically
2014-07-11 17:29:46 +03:00
Michael Pavlyshko
a96cd51c5a
suppress extra GCC warnings on Windows
2014-07-11 14:09:14 +03:00
Michael Pavlyshko
2a18a09d12
install dlls on Windows
2014-07-11 14:08:20 +03:00
Michael Pavlyshko
3c36bc9f51
Enable FFmpeg for all platforms
2014-07-11 12:43:24 +03:00
Michael Pavlyshko
457e922cca
fix iconv check
2014-07-11 11:25:20 +03:00
Michael Pavlyshko
bad7050096
spaces -> tabulation
2014-07-11 11:01:03 +03:00
Michael Pavlyshko
3b80c52fc4
Oops, reverting CXX_FLAGS back
2014-07-11 01:27:05 +03:00
Michael Pavlyshko
8581cfd5d8
link with iconv only when iconv is found
2014-07-11 00:23:06 +03:00
Michael Pavlyshko
08ee65c3c8
fix .dll and .exe filenames
2014-07-10 01:06:37 +03:00
Michael Pavlyshko
ce5f59e8b6
Fix windows linkage, also, use SYSTEM_LIBS variable for OS-dependent libraries
2014-07-10 00:41:31 +03:00
Michael Pavlyshko
7405066cbd
Link with wsock32 lib
2014-07-09 17:36:01 +03:00
Michael Pavlyshko
3443ba5bb3
fix libvcmi linking
2014-07-09 01:43:13 +03:00
Michael Pavlyshko
e0134aed0b
Delete unused include
2014-07-08 02:00:11 +03:00
Michael Pavlyshko
2957377360
Fix *_DIR variables for windows
2014-07-07 23:21:59 +03:00
Michael Pavlyshko
476c7c32dc
CMake/SDL2: add ability to find SDL2 without pkg-config
2014-07-05 21:47:03 +03:00
AlexVinS
195eae48ca
Merge branch 'develop' into SDL2
...
Conflicts:
client/CPlayerInterface.cpp
2014-07-02 17:15:12 +04:00
Ivan Savenko
4441bd12db
(linux) version set to 0.96
2014-07-01 21:02:03 +03:00
AlexVinS
3b8d0e44d4
Merge branch 'develop' into SDL2
2014-06-24 14:09:44 +04:00
Ivan Savenko
13bc4cb24f
Added -fvisibility=hidden parameter for gcc.
...
Should help a bit with endless missing DLL_LINKAGE attributes and
(according to gcc docs) help a bit with library loading times.
2014-06-24 00:05:53 +03:00
Ivan Savenko
8eb661461c
- vcmi compiles with SDL2 on Linux, video player is disabled for now
2014-06-13 07:55:45 +04:00
stopiccot
7356145c3a
updated LD_RUNPATH_SEARCH_PATHS
2014-03-04 03:51:17 +00:00
Ivan Savenko
5563db9145
- my part of chagelog + some formatting
...
- version bump on Linux side
- enabled PCH by default in cmake
2014-02-26 14:19:14 +00:00
beegee1
95034b9fa0
- Updated PCH to use our StdInc.h as the prefix header (not generated one from cotire) -> no exclude headers from ffmpeg/etc... statements required
...
- Fixed compilation error (VCAI ResourceSet logging)
2014-02-05 20:25:36 +00:00
beegee1
df0a28d9cb
- added PCH compilation for CMake using cotire module (PCH is OFF per default, can be enabled with ENABLE_PCH=ON)
2014-02-01 13:37:26 +00:00
Ivan Savenko
f6c1dace6c
Minors:
...
- By default, cmake will keep debug info
- removed warnings from adventure map infobox (part of #1636 )
- adventure map infobox will refresh on artifact changes (part of #1636 )
- moved terrain music files to terrains.json file
- player should act before AI in all games, not only campaigns
2013-12-28 18:57:08 +00:00
stopiccot
c5e0e48d98
Some OS X related fixes
2013-12-13 11:51:15 +00:00
Ivan Savenko
2b6cdd5f41
- (linux) launcher will be available in OS start menu/launchers as
...
"VCMI" and client will be present as "VCMI Client"
2013-11-16 18:13:30 +00:00
Ivan Savenko
2b3405fa50
- minor optimizations
...
- fixed incorrect error reporting in launcher
- set WoG version to "0.0.0" so full version will be installed from repo
in future
- updated debian required packages list
- launcher will be enabled by default
2013-11-14 13:21:09 +00:00
Ivan Savenko
55577d0ac4
- fixed missing DLL_LINKAGE
...
- use precalculated checksum for zip files
- UNUSED macro to silence some warnings
2013-11-09 13:49:36 +00:00
Ivan Savenko
ee6cdbeffe
went through the rest of cppcheck warnings, mostly harmless
2013-11-07 12:48:41 +00:00
Ivan Savenko
c4716d0a9a
- reordered files in cmake so files with long compile times will be
...
compiled first.
- changed format of modSettings.json, VCMI should properly update file
on the first run.
- implemented property "defaultTavern" that acts as default value for
"tavern" entry in hero class and town formats.
2013-11-03 12:07:23 +00:00
beegee1
9ebd4a5c00
Changes due to boost locale:
...
- Updated README.linux
- Fixed missing boost locale include when compiling with unit tests
- Updated RPM spec (increased minimum boost version, added boost locale requirement)
2013-11-02 17:16:07 +00:00
Ivan Savenko
e2c037402c
Unicode support.
...
- boost-locale library is now required (boost 1.48 or higher)
- Unicode namespace that contains UTF-8 handling
- All non-ASCII strings from H3 data will be converted to UTF-8 during loading
- All JSON files MUST use UTF-8.
- H3 data encoding can be selected via launcher or directly in config file
2013-10-25 21:45:14 +00:00
stopiccot
cbc8cde10a
some OS X fixes
2013-10-07 01:19:02 +00:00
