DjWarmonger
|
89c97a88bb
|
Updated Visual projects for SDL2.
|
2014-07-15 12:26:18 +02:00 |
|
DjWarmonger
|
3a19bf964a
|
Merge branch 'develop' of https://github.com/vcmi/vcmi into develop
|
2014-07-15 11:50:50 +02:00 |
|
Ivan Savenko
|
68678f7d5a
|
Added own e-mail for Travis notifications
|
2014-07-14 17:01:44 +03:00 |
|
Ivan Savenko
|
2894f53a68
|
Merge pull request #28 from Mixaill/travis-2
Travis support
|
2014-07-14 17:00:19 +03:00 |
|
Michael Pavlyshko
|
69ca17d985
|
Disable Clang 3.1.
|
2014-07-13 18:14:14 +03:00 |
|
Michael Pavlyshko
|
5f04c596b1
|
trying to update Qt
|
2014-07-13 14:08:16 +03:00 |
|
Michael Pavlyshko
|
2f9bc5fc9a
|
use ffmpeg ppa
|
2014-07-13 11:44:39 +03:00 |
|
Michael Pavlyshko
|
9d2b87ba4d
|
try to fix clang
|
2014-07-13 11:33:44 +03:00 |
|
Michael Pavlyshko
|
023943ad81
|
Disable gcc 4.6
|
2014-07-12 20:20:02 +03:00 |
|
Michael Pavlyshko
|
1dd0a04e54
|
fix
|
2014-07-12 19:57:50 +03:00 |
|
Michael Pavlyshko
|
704f7e190b
|
add some more compilers
|
2014-07-12 19:50:48 +03:00 |
|
Michael Pavlyshko
|
1744248095
|
travis support
|
2014-07-12 16:35:55 +03:00 |
|
Ivan Savenko
|
e78491fda2
|
Merge pull request #27 from Mixaill/cmake-2
Make CPack functional on Windows
|
2014-07-12 14:18:25 +03:00 |
|
Michael Pavlyshko
|
83aff2d68e
|
* remove static linking for libgcc
* fix clang warnings
|
2014-07-12 14:10:44 +03:00 |
|
Michael Pavlyshko
|
13cbf0bbca
|
disable fPIC for windows
|
2014-07-11 23:11:19 +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
|
f7d8faa540
|
install only .dll (without .dll.a)
|
2014-07-11 17:27:50 +03:00 |
|
Ivan Savenko
|
59586df402
|
Merge pull request #25 from Mixaill/cmake-2
Make CMake functional on Windows
|
2014-07-11 15:51:40 +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
|
c25ccc2acb
|
Rename: vcmi.dll -> VCMI_lib.dll, vcmilauncher.exe -> VCMI_launcher.exe
|
2014-07-11 01:09:00 +03:00 |
|
Michael Pavlyshko
|
29e6c2c412
|
add WIN32 flag for vcmilauncher to hide console window
|
2014-07-11 00:57:17 +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
|
c935193558
|
disable WIN32 flag for executables, fix previous commit
|
2014-07-10 00:47:22 +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
|
11d73f2ac9
|
fix CVideoHandler compilation
|
2014-07-09 18:01:12 +03:00 |
|
Michael Pavlyshko
|
24af413d61
|
define M_PI
M_PI isn't a part of standard and may be undefined.
|
2014-07-09 17:42:22 +03:00 |
|
Michael Pavlyshko
|
afc6530084
|
fix vcmiclient linkage
|
2014-07-09 17:37:08 +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
|
820eceb8ad
|
Add VCMI_DLL flag for libvcmi
|
2014-07-08 01:50:44 +03:00 |
|
Michael Pavlyshko
|
2957377360
|
Fix *_DIR variables for windows
|
2014-07-07 23:21:59 +03:00 |
|
Ivan Savenko
|
ca86416953
|
Fixed compilation with gcc 4.7
|
2014-07-07 11:02:55 +03:00 |
|
Ivan Savenko
|
142272d588
|
Debian/Ubuntu builds will use SDL1.2
|
2014-07-07 09:16:28 +03:00 |
|
Ivan Savenko
|
aaf314baf4
|
Source ID from bonusing objects is not object index but object type. Fixes at least partially #1822
|
2014-07-07 08:29:07 +03:00 |
|
AlexVinS
|
ec7e58786d
|
Merge branch 'SDL2' into develop
|
2014-07-06 21:34:04 +04:00 |
|
Alexander Shishkin
|
b761645a50
|
Merge pull request #24 from Mixaill/cmake
CMake/SDL2: add ability to find SDL2 without pkg-config
|
2014-07-06 21:32:06 +04:00 |
|
Michael Pavlyshko
|
476c7c32dc
|
CMake/SDL2: add ability to find SDL2 without pkg-config
|
2014-07-05 21:47:03 +03:00 |
|
AlexVinS
|
0edd10078f
|
Fix usage of fillRect.
* proper fix for slider drawing
|
2014-07-05 01:52:11 +04:00 |
|
AlexVinS
|
e70e68a56b
|
Fix puzzle map fade.
|
2014-07-03 23:06:11 +04:00 |
|
AlexVinS
|
74d3effa98
|
More safe way of update locking
|
2014-07-03 22:30:56 +04:00 |
|