Commit Graph
52 Commits
Author SHA1 Message Date
Jason Felds 166e4c8287 Allow optional logging of timing segment mods.
For those with many songs, it gets annoying.
2015-11-01 06:49:31 -05:00
Jason Felds 79d4f45096 Have users uninstall older versions first. 2015-10-31 10:31:22 -04:00
Jason Felds 4b0b672e30 Merge pull request #908 from wolfman2000/wolf-version-bump-5-0-10
Bump up the version to 5.0.10.
2015-10-27 20:43:47 -04:00
Jason Felds 63ff523360 Bump up the version.
...I am aware of the duplicated variable. That will be fixed for the version after.
2015-10-27 20:42:04 -04:00
Jason Felds 47d59c9dd7 Default to linking with /MT instead of /MD for VS. 2015-10-27 19:33:05 -04:00
Jason Felds e0290fc856 Compile the Texture Font Generator with cmake.
This program is not built by default. Enable one of the following options to utilize it:

* WITH_FULL_RELEASE
* WITH_TEXTURE_GENERATOR

It is heavily advised to make sure the MFC library is installed for Visual Studio and the computer is restarted afterwards.

As a bonus, `zlib1.dll` can go away now.

The old visual studio projects are still in play in case others still struggle with the code fixes.
2015-10-27 18:11:37 -04:00
Jason Felds 3dd2f54678 Add IRC feedback from Windows build servers. 2015-10-25 13:12:14 -04:00
Jason Felds d0df75205f Allow customizing the number of jobs for ffmpeg.
Yes, it is now possible to use a different number of jobs for ffmpeg and stepmania proper.
2015-10-25 07:07:48 -04:00
Jason Felds 7ed09304d0 Merge pull request #895 from latot/master
Remove WITH_VERSION_INFO, version info by default
2015-10-22 20:53:44 -04:00
latot 47b0f83aed Remove WITH_VERSION_INFO, version info by default 2015-10-22 21:21:47 -03:00
latot e6717903c3 WITH_SYSTEM_FFMPEG add description 2015-10-22 20:51:05 -03:00
Jason Felds c05e38c0aa ...I forgot to commit the new file. 2015-10-08 19:33:52 -04:00
Prcuvu 05ae23d1c4 Read DirectX SDK path from environment variable. 2015-10-06 15:49:25 +08:00
Jason Felds b717918298 Try a more flexible DirectX search path setup.
This is being done to get Appveyor to work.
2015-10-05 16:50:24 -04:00
Jason Felds b0465a8622 Revert "Default to GPL off for ffmpeg." 2015-10-04 14:33:06 -04:00
Jason Felds 27ef5301ec Default to GPL off for ffmpeg. 2015-10-04 12:53:56 -04:00
Vincent Laviron 93cc62f0ad Fix CMake build with option WITH_SYSTEM_FFMPEG 2015-10-04 16:38:08 +02:00
Jason Felds b8700f11a7 Finally bring ffmpeg 2.1.3 to Mac OS X.
This replaces #611.
2015-10-03 22:32:14 -04:00
Jason Felds 4586e6bef7 Forgot to remove this line. 2015-10-03 20:44:17 -04:00
Jason Felds f9a1f728af Reference bzip2 and iconv on Mac OS X properly.
This removes the need for the arbitrary other linker flags.

This is required to allow for proper building of ffmpeg (the next goal).
2015-10-03 20:38:38 -04:00
Jason Felds b3a5a82b5c Bring us closer to working with MinGW again.
The biggest obstacle right now deals with FFMPEG. I insist on being able to utilize the git clone/submodule (5_1_0) section. I'm just struggling with the commands.

As part of this commit, some linux files are restored in the compilation chain. This is for consistency with the old Makefile approach.

Assistance will be needed at this point to complete MinGW support.
2015-09-27 17:07:15 -04:00
Jason Felds abf58e11cf Modify the NSIS template for a better installer.
This brings it closer in-line to what we used prior to CMake.
2015-09-27 11:52:45 -04:00
Jason Felds 598233d72e Restore nasm support for ffmpeg building. 2015-09-26 10:45:38 -04:00
Jason Felds 68b3620bac Allow proper compiling of libjpeg for windows.
This expands on #777 to work with jconfig.h properly.

To facilitate these operations, a new macro was added for doing compile tests.

Note that this commit does NOT bring in the other files associated with this version of libjpeg.

At some point, it would be desirable to automatically get the files as part of the cmake configuration step, similar to ffmpeg.
2015-09-13 13:10:58 -04:00
Jason Felds 91361e5d29 Allow changing WAV and OGG settings for all OSes.
As before, set WITH_WAV and WITH_OGG to off to limit your playing experience. Why this would be done is beyond me, but it's available.
2015-09-12 11:58:57 -04:00
Jason Felds b143f5afca Improve and enhance WITH_MP3.
* All OSes can now take advantage of it.
* Mad is not linked if not utilized.
* Mac OS X side has a cleaner library list setup now.
2015-09-12 11:23:45 -04:00
Jason Felds 2448e67641 Switch portable tomcrypt to ON by default. 2015-09-09 20:47:46 -04:00
Jason Felds ae83a1c6ec Fixes for Linux. 2015-09-05 13:14:44 -04:00
Jason Felds e093d204c8 Use proper cmake detection of features.
This attempts to organize all needed items and places appropriate defines
in a single location. Redundant comparisons/defines were removed when noticed.

A few caveats, however:

* This may be better targeted towards the 5_1_0 branch instead of master right now.
* Cmake will run a little slower on configuration/generation now. That's due to the sanity checks it runs.
* There are some more checks to be added later, but this should be a solid start.

Thanks to the [libical](https://github.com/libical/libical) project for inspiration.
2015-09-05 10:51:17 -04:00
Jason Felds 0075192ada ...silly typo. 2015-08-20 18:24:50 -04:00
Jason Felds 4344d0114a Have Windows build with Minimaid on by default. 2015-08-20 16:50:10 -04:00
Jason Felds 42ad044817 Linux broke somehow. Restore it with system jpeg. 2015-06-19 20:53:13 -04:00
Kyzentun Keeslala 7440f116b6 Update version number to 5.0.9. 2015-06-19 16:21:29 -06:00
Kyzentun Keeslala 963a204fb0 Fixed the cmake method used to generate the date and time strings. 2015-06-03 10:31:31 -06:00
Renaud Lepage a2183d15c1 Reactivating Crash Manager on the Linux platform 2015-05-25 09:57:43 -07:00
Renaud Lepage da93b4fb9b Alter verstub generation 2015-05-25 09:54:04 -07:00
Jason Felds 8394366238 Prepare timestamp macros. 2015-05-25 12:43:22 -04:00
Jason Felds 99b8b6dbbb Move versioning info to standalone file.
Thanks to @cybik for some of the assistance.
2015-05-25 12:36:58 -04:00
Jason Felds d6e98db50a Put the license file in the CMake folder.
This way if anyone wants to wipe their entire Build directory, it won't break entirely.

I am not responsible if anyone wipes the CMake folder. That is definitely not supported.
2015-05-24 21:01:49 -04:00
Jason Felds b934a25cb2 Try to not need WITH_LIBVA. 2015-05-19 20:08:15 -04:00
Joe 89aef33f0f Added missing lines of FindJACK.cmake - now finds JACK successfully 2015-05-11 15:40:55 +01:00
Jason Felds 86b0a207d9 A few cmake related fixes:
* Restore Windows installing to `C:\Games` by default.
* Restore Windows installing to the `Program` subdirectory.
* Use actual newlines in the `Build` documentation files.
* Remove the text that says that cmake is unstable.
2015-05-10 09:32:56 -04:00
Jason Felds edecedd3ee Allow disabling CrystalHD for ffmpeg. 2015-05-08 22:12:47 -04:00
Jason Felds 283de4f0c2 Restore Xcode debugging with newer builds. 2015-04-18 13:58:16 -04:00
Jason Felds 028229f881 Allow for assembly free[r] tomcrypt builds. 2015-04-16 18:31:29 -04:00
Jason Felds e4807b9b85 Allow for the va library to be used with ffmpeg.
This needs verifying.
2015-04-15 18:22:36 -04:00
Jason Felds 361df3a496 Provide initial cpack support. Mainly for devs.
There are two targets you may not be familiar with, `install` and `package`.
* For Linux, `install` now defaults to `/usr/local`, but you can set it back to `/opt` with `cmake -DCMAKE_INSTALL_PREFIX=/opt` if you wish.
* For Windows, `install` may not work, but this is not a target you would want usually.
* For Linux, `package` has not been tested yet. It will likely create an archive file of what is installed.
* For Windows, `package` will create an NSIS package that can be used to install StepMania. One minor change as a result is that the binary and companion dlls will be placed in `bin` instead of `Program` now, but it makes no difference code-wise.

Mac OS X users: for now, use the `dmg` target instead.

This commit does *not* deprecate the original nsi script yet. The Texture Font Generator program has not been addressed yet.
2015-04-11 23:47:42 -04:00
Jason Felds f78574e5a7 More cmake changes:
* Replace `string(CONCAT ...)` with an equivalent call for the cmake 2.8.12 users.
* Use `execute_process` instead of the deprecated `exec_program`. This will work regardless of version (assuming the minimum is met at least).

This should address issue #549.
2015-04-06 22:35:04 -04:00
Jason Felds c49d78f5fc Linux CMake improvements:
* Disable warning output during configuration.
* Allow users to turn on warnings for ffmpeg and other internal projects.
* Add a new variable for easier ffmpeg version migration if we ever
* pursue that.
2015-04-05 14:49:10 -04:00
Jason Felds 05d341485d Allow for system ffmpeg usage.
Warning: this is NOT advised right now.
2015-03-22 16:03:38 -04:00