Commit graph

184 commits

Author SHA1 Message Date
Pali Rohár
c1df18ef4d Fix generating file version-generated.h 2013-02-05 23:39:30 +01:00
Pali Rohár
2fc762b2d9 In Windows NSIS Installer use version from cmake 2013-02-05 22:27:43 +01:00
Pali Rohár
2f667d0c85 Add VERBATIM to all cmake add_custom_command calls, which causing that arguments will be escaped properly 2013-02-05 22:19:20 +01:00
Pali Rohár
a0ff593ed8 Generate version string at compile time from CMakeLists.txt and from bzr revision
* Move StratagusMajorVersion, StratagusMinorVersion, StratagusPatchLevel and StratagusPatchLevel2 to CMakeLists.txt
* Added tool genversion.cpp which (re)generate file version-generated.h from cmake if needed
* Fill VERSION macro from other values with C preprocessor instead hardcoded values
* Remove macros StratagusFormatString and StratagusFormatArgs from code, use only VERSION
2013-02-05 22:16:43 +01:00
Pali Rohár
7c2f6c81a9 Remove HAVE_X and HAVE_X11 definitions, add USE_X11
* This commit enabling clipboard (copy/paste) support on systems with X server

* Now we are using USE_* defines for stratagus features and HAVE_* defines for system native functions (not reimplemented in stratagus)
* So all stratagus builds with different HAVE_* defines should work same and should have same features
2013-02-05 17:14:46 +01:00
Pali Rohár
e7146ac413 Fix ENABLE_STRIP in CMakeLists.txt, now working only with gcc 2013-02-05 17:00:02 +01:00
Pali Rohár
db0fc4d49c Add -DDEBUG via add_definitions 2013-02-05 16:56:16 +01:00
Pali Rohár
d291e598a3 Remove __unix, unix and __APPLE__ defines, add new USE_LINUX and use USE_LINUX and USE_APPLE in current code 2013-02-05 16:48:08 +01:00
Pali Rohár
cfc336586b Use cmake for determinate if system has getopt function, use util.h for getopt 2013-02-05 15:54:34 +01:00
Pali Rohár
606d5ef476 Functions strcpy_s, strncpy_s and strcat_s must return errno_t
* Use cmake for determinating if system has above functions
* Compile our implementations only if system does not have these functions
* Define macro _TRUNCATE if is not defined
* Define errno_t if is not in any standard header include file
* Define prototypes of above functions only if system does not have them

* This commit fix compilation with ubuntu mingw-w64 cross compiler
2013-02-05 15:28:21 +01:00
joris
76cb9306a7 Move Popup releted stuff from ui.cpp into (new) popup.cpp 2012-12-31 15:24:08 +01:00
joris
c0f82a019a Move CUITimer and CStatusLine in there own files. 2012-12-31 14:08:18 +01:00
joris
c01bef9426 Use PixelPos in ContentType.
Fix some error message.
Commit missing CMakeLists.txt modifications for the new files from last commit
2012-12-31 12:02:34 +01:00
Pali Rohár
3aa2e8230e PkgConfig package is needed only on Linux for determinate Maemo platform 2012-12-28 09:40:09 +01:00
cybermind
09e63586c7 [+] Added new order COrder_Defend, which allows to send some unit to defend another. You may use right click with ALT, or use the "move" button with ALT button
[*] The coward units in AI force now use Defend order instead of attacking. The same rule applies to summoned units.
[*] The summoned units get GroupId = -1 to avoid AI defence force activate
[*] Changed CclKillUnitAt to use CclGetPos
2012-12-27 14:58:44 +06:00
cybermind
57ecef96a2 [+] AI improvement: it can now gather all units close to enemy, after that it attacks
[-] Fixed missing file in previous commit
[-] Fixed bug when player cancels a building.
[-] Fixed bug with speedup variables in CclGetPlayerData and CclSetPlayerData
2012-08-31 22:55:27 +06:00
Pali Rohár
e89e3ed2e7 Release version 2.2.7 2012-08-20 15:27:46 +02:00
joris
16f09eecc7 Move CColor in its own file.
Remove SDL dependency for font.h
Remove duplicated container AllFonts
Remove unused Macro MaxFonts
2012-08-14 17:35:58 +02:00
joris
dec4c95232 rename network/lowlevel.cpp into network/net_lowlevel.cpp (according to .h) 2012-08-13 14:51:43 +02:00
joris
62f36a96b3 Create game.h and move some stuff from stratagus.h into more appropriate header. 2012-08-11 14:19:13 +02:00
joris
5f54853efe Add specific spell header 2012-08-10 15:40:52 +02:00
joris
abfe3f2086 Split spell by SpellActionType. 2012-08-10 13:26:54 +02:00
joris
d6da2d2c21 Move spell stuff in its own directory. 2012-08-10 12:23:53 +02:00
cybermind
dde984d690 [+] Added new RadialParticle
[+] Make particles more configurable from Lua
[+] Added 'g' flag for ParseAnimInt to get flag for target unit
[+] Added MissileOffsets array which allows more correct placing for missile's starting point (not from unit's center, but from cannon's hole etc.)
[+] Added CclGetUnitBoolFlag to get unit's bool-flags in Lua
[+] Removed speedup variables (SpeedResourcesHarvest, SpeedResourcesReturn, SpeedBuild, SpeedTrain, SpeedUpgrade, SpeedResearch) into player's code, now speedup could be set individually for each player
[+] Added CUpgradeModifier::ModifyPercent for modifying variables by percent, not by const value.
[+] Added MissileType::Pierce to allow missiles damage everything on their way
[+] Added map preview image generation function for editor (not ready for OpenGL yet)
[+] Added flag for CclCreateMissile to control missile's damage
[*] Missiles now fly into unit's center (according to the comment in code, the old behaviour was to be used for bunkers)
[-] Fixed random number generation code in animations
[-] Fixed "Flushing removed unit" message for boarded units
[-] Fixed unit death into container (happens when unit is temporary)
[-] Fixed land-only restriction for transporters
[-] Fixed "spell-cast" mouse action for non-enemy units (now it's possible to use this action for medics)
[-] Fixed compilation for MSVC9
2012-08-08 03:08:27 +06:00
joris
6cc0f43065 Remove include of translate.h from stratagus.h
Remove unused StratagusTranslation and GameTranslation
Add translate.pkg
2012-08-06 13:22:03 +02:00
Pali Rohár
54b1a6471f Add support for custom pixmaps path 2012-07-15 14:10:42 +02:00
Joris
55d9c4b267 Move some functions from unit.cpp to unit_find.cpp
Add unit_find.h
2012-06-29 13:18:12 +02:00
Pali Rohár
26b6ba193a CMakeLists.txt: Set correct defaults install paths 2012-06-19 18:41:00 +02:00
Pali Rohár
ee51382a4e Do not overwrite CMAKE_CXX_FLAGS and CMAKE_EXE_LINKER_FLAGS variables
Make install paths configurable

Patch by hasufell
2012-05-20 19:48:55 +02:00
Joris
13d6e457e2 Move CViewport in its own header,
rename X, Y into TopLeftPos
rename EndX, EndY into BottomRightPos
Factorize code with new methods Contains, Restrict, SetClipping
Change Center param: now takes directly mapPixelPos instead of tilePos + offset.
fix typo in mouse.cpp from previous commit.
2012-04-26 18:29:43 +02:00
Joris
50e5390ca7 Add MissileConfig
and some clean up.
2012-04-18 12:16:22 +02:00
Joris
323b91c6b7 split missile file. 2012-04-17 12:18:53 +02:00
Joris
c3bff8491d Move missile in its own directory. 2012-04-17 10:58:43 +02:00
joris
720a91ac5e Move CunitPtr in its own file 2012-04-15 19:06:44 +02:00
joris
f1e72f243d CAnimation have now derivated classes, and don't use union anymore. 2012-04-01 17:29:51 +02:00
joris
5522c43686 'die' animation is now managed for all actions. 2012-03-31 09:34:59 +02:00
joris
0e4a084c79 Move action/animation.cpp to animation/ 2012-03-25 18:37:53 +02:00
joris
a1130dfbeb Split scr/actions.cpp into actions.cpp/animation.cpp 2012-03-20 09:28:31 +01:00
joris
4a958b3c16 Spilt actions.h into specific header. 2012-02-27 19:46:19 +01:00
joris
c6b336bc73 Split action_buil{d,t}.cpp
remove empty action_returngoods.cpp, action_stand.cpp
2012-02-25 13:51:12 +01:00
Pali Rohár
5b057a8ae1 Mingw: Link with dxguid (fix linking) and add -fsigned-char to CMAKE_CXX_FLAGS (fix building RC object) 2012-02-25 10:23:53 +01:00
joris
85e0aac1e9 Remove useless dependency dxguid 2012-02-25 09:17:29 +01:00
Pali Rohár
65d29fdd8e CMake: gcc - make sure that char is signed 2012-02-18 10:16:04 +01:00
Pali Rohár
a1e9861094 cmake: Add sections for tolua pkg files and doxygen depends files
Also remove file names with '*' and then cmake with ninja works too
2012-01-17 01:25:05 +01:00
Pali Rohár
8d4e9572f5 Fixed compilation on Maemo with Touchscreen 2012-01-02 23:13:23 +01:00
Pali Rohár
b160633444 Fixed compile errors on Maemo 2011-12-30 13:24:23 +01:00
Pali Rohár
c2cb48c3b9 Fixed compile errors on OpenBSD 2011-12-30 11:44:30 +01:00
Pali Rohár
630fc2c65c Release version 2.2.6 2011-12-24 16:16:33 +01:00
Pali Rohár
98803131db Fix stack overflow on MinGW32 2011-12-24 16:16:18 +01:00
Pali Rohár
125132b62a CMake: add option ENABLE_STRIP for stripping all symbols from executables 2011-12-19 18:16:02 +01:00
Pali Rohár
3ce0fc416d Fixed definitions in gameheaders for proper generating doxygen doc 2011-11-06 20:39:07 +01:00
Pali Rohár
1eb620711e Make doxygen documentation files with relative paths, add generated file tolua.cpp to doxygen too 2011-11-06 16:53:50 +01:00
Joris Dauphin
b2b01100d6 Remove "empty" file ui/menus.cpp 2011-10-12 15:05:55 +02:00
Pali Rohár
0054972e65 Fixed compilation attachconsole.cpp with MSVC
* use LoadLibrary and GetProcAddress for functions NtQueryObject and AttachConsole (missing ntdll.lib on MSVC)
 * use integers for NtQueryObject and AttachConsole instead defined macros (missing on MSVC)
 * removed wincon.h and winternl.h include (not needed anymore)
 * removed WINVER define
 * removed linking ntdll library
2011-09-19 22:25:14 +02:00
Pali Rohár
78fd1c35c4 Clean WINAPI attachconsole.cpp
* move reopen code to separate function
 * continue if one std reopen failed
 * if one std is ignored, restore winapi handle back after attaching console
2011-09-03 00:57:36 +02:00
Pali Rohár
9d2fec0f87 Updated info in doc/changelog.html, renamed it to name with lower chars 2011-08-09 09:19:14 +02:00
Pali Rohár
b2e8cb9a90 Fixed gameheaders 2011-08-08 15:47:57 +02:00
Pali Rohár
5e35702ba9 Added Stratagus Game headers file for easy creating Game Launchers and Maemo Extractors 2011-08-08 15:28:05 +02:00
Pali Rohár
3ad80c26dc Fixed compiling Stratagus on Mac
This fixed bug: https://bugs.launchpad.net/stratagus/+bug/816573
2011-07-27 11:17:09 +02:00
Pali Rohár
9aef91d48a Added maemo source files to group in CMake
Doxygen fix for maemo
2011-05-24 22:51:58 +02:00
Pali Rohár
d7b5cc6b87 Generate doxygen documentation to build directory
Added rules for CMake to install documentation and man page
Fixed debian control files for these changes
2011-05-24 22:50:07 +02:00
Pali Rohár
d078ff4196 Move Maemo platform code to files maemo/maemo.cpp and include/maemo.h 2011-05-23 22:41:19 +02:00
Pali Rohár
d58105c1fb Moved touch screen input code from USE_MAEMO to #ifdef USE_TOUCHSCREEN
Now it is possible to compile Stratagus with touchscreen input on other then Maemo platform
2011-05-23 19:50:57 +02:00
Pali Rohár
f370f3859b Do not show lot of Doxygen generating messages
Disable generating Doxygen documentation by defaut
2011-05-23 18:12:24 +02:00
Pali Rohár
75874faa32 Added more verbose message about status in CMake 2011-05-23 17:55:14 +02:00
Pali Rohár
32229d8c72 Show more info in cmake log 2011-04-13 12:56:10 +02:00
Pali Rohár
f967400740 Use LibOSSO only on Maemo 2011-04-13 12:37:37 +02:00
Pali Rohár
0e4f300d3a Clean OpenGL and OpenGLES section in cmake 2011-04-13 07:41:04 +02:00
Joris Dauphin
e6c279718f Add macro _CRT_SECURE_NO_WARNINGS _CRT_SECURE_NO_DEPRECATE for msvc to avoid warnings 2011-04-11 19:13:16 +02:00
Pali Rohár
aacff7bf76 Fixed running cmake if makensis is not found 2011-04-02 10:32:11 +02:00
Pali Rohár
6b69bd7548 Disabled generating NSIS Installer by default, fixed cmake messages 2011-04-01 20:47:26 +02:00
Pali Rohár
7198f23dbf Visual Studio fixes:
- Show files in subfolders (using cmake command source_group)
- Show header files too (added header files to add_executable)
2011-04-01 20:28:36 +02:00
Pali Rohár
f78ba49990 Move metaserver to top dir, fix CMake and Doxygen paths 2011-03-29 10:57:49 +02:00
Pali Rohár
29b552e4f1 Print compile info when CMake configuring 2011-03-27 11:50:36 +02:00
Pali Rohár
06a40c4926 Fixed detecting Maemo platform in CMake, added support for library LibOSSO 2011-03-27 11:00:14 +02:00
Pali Rohár
713c40b2e4 Added support for MakeNSIS and UPX in CMake
Updated Windows NSIS Installer
2011-03-27 10:18:56 +02:00
Pali Rohár
5315f5694d Fixed USE_ definitions 2011-03-26 23:32:47 +01:00
Pali Rohár
c9c69a0a7e Fixed generating DoxyGen documentation, added to CMake 2011-03-26 23:30:14 +01:00
Pali Rohár
8bdb1a3f52 Removed tolua++ files from Stratagus tree
Use system tolua++ library
2011-03-26 23:25:36 +01:00
Pali Rohár
95eb85a4dc Decrease minimum cmake version to 2.6, added Maemo OpenGL ES 1.1 hack 2011-03-25 22:08:04 +01:00
Pali Rohár
5a36bb67b6 Removed all Makefiles and autotools files
Removed all MSVC build files
Removed all autogenerated files
Removed other unused scripts/files
Windows platform specified files moved to src/win32
Cleaned .bzrignore
2011-03-06 20:38:55 +01:00
Pali Rohár
329e175ef6 Use RC compiler only on Windows 2011-03-06 20:18:05 +01:00
Pali Rohár
5faeecd6cb Fixed CMake
- Added support for static linking (on Mingw --static-libgcc)
 - Fixed compiling resource file on Windows
 - Fixed searching for tolua++
2011-03-06 18:07:24 +01:00
Pali Rohár
9938ade670 Initial support for CMake build system 2011-03-05 23:36:56 +01:00