Commit Graph
100 Commits
Author SHA1 Message Date
Jason Felds 99b79e5410 Generate verstub.cpp through raw cmake.
There is no need for an extra program.

As a bonus, generate a consistent windows vdi file.

There is still an issue with actually *reading* the vdi, but that's for someone else to tackle.
2015-10-02 21:56:02 -04:00
Jason Felds 429d4dbce2 Merge pull request #801 from wolfman2000/wolf-remove-ffmpeg-bundle
Remove no longer used ffmpeg bundle.
2015-10-01 16:14:21 -04:00
Jason Felds 5bade2b88f Merge pull request #807 from wolfman2000/wolf-cmake-mingw-partial
Bring us closer to working with MinGW again.
2015-09-27 17:30:01 -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 5fd90b7502 Merge pull request #806 from wolfman2000/wolf-cmake-pch-windows
Re-enable precompiled headers for Windows.
2015-09-27 15:02:04 -04:00
Jason Felds c7943a85ee Re-enable precompiled headers for Windows.
The speed is brought back up to reasonable limits considering I work with a VM primarily.
2015-09-27 14:45:35 -04:00
Jason Felds c10eb70cea Merge pull request #804 from wolfman2000/wolf-cmake-cpack-template
Modify the NSIS template for a better installer.
2015-09-27 14:05:02 -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 984005f9e4 Merge pull request #802 from wolfman2000/wolf-buffer-cleanup
Remember to fill in new char's.
2015-09-26 21:15:17 -04:00
Jason Felds 537af8d866 Remember to fill in new char's.
...we seriously need to use a standard <string>.

*glares at Yaniel*
2015-09-26 21:03:46 -04:00
Jason Felds 5174e6b306 Remove no longer used ffmpeg bundle.
We get better versions via cmake/submodules anyway.
2015-09-26 16:14:01 -04:00
Jason Felds d878a44a9b Merge pull request #787 from wolfman2000/wolf-rstring-buffer-dead
NOW all of the buffer calls should be dead.
2015-09-26 16:09:23 -04:00
Jason Felds 977845cec5 Merge pull request #799 from wolfman2000/wolf-ffmpeg-nasm
Restore nasm support for ffmpeg building.
2015-09-26 11:57:30 -04:00
Jason Felds 598233d72e Restore nasm support for ffmpeg building. 2015-09-26 10:45:38 -04:00
Jason Felds 2753089e1f Merge pull request #798 from wolfman2000/wolf-travis-enhancements-master
Update and enhance travis's building capabilities.
2015-09-25 21:10:17 -04:00
Jason Felds 0a6b785a9e Master does not require c++1x stuff yet. 2015-09-25 20:46:58 -04:00
Jason Felds 559616686c Update and enhance travis's building capabilities.
Borrow (proper) ideas from [ldionne's work](https://github.com/ldionne/hana/blob/c8542789946b9ff8be693301c7b57d8bd14d8c4b/.travis.yml)
2015-09-25 20:20:21 -04:00
Jason Felds 731bc0984a Merge pull request #791 from wolfman2000/wolf-vorbis-windows-build
Build vorbis & vorbisfile in Windows now.
2015-09-20 16:39:09 -04:00
Jason Felds 0382929bd4 Build vorbis & vorbisfile in Windows now. 2015-09-20 13:13:47 -04:00
Jason Felds 1fb7993f9f Merge pull request #790 from wolfman2000/wolf-ogg-windows-build
Enable static compiling of ogg.
2015-09-20 11:48:04 -04:00
Jason Felds baebe951b8 Enable static compiling of ogg.
Using "newogg" as the directory since I wish to reserve libogg for eventual `git submodule`-ing.
2015-09-20 09:36:38 -04:00
Jason Felds f2d24aa0e3 Merge pull request #788 from wolfman2000/wolf-fadvise-headers
Utilize the headers that POSIX_FADVISE requires.
2015-09-19 20:50:27 -04:00
Jason Felds eac97a4b47 Utilize the headers that POSIX_FADVISE requires. 2015-09-19 20:37:15 -04:00
Jason Felds 8512665f27 NOW all of the buffer calls should be dead. 2015-09-19 20:06:33 -04:00
Jason Felds f112234655 Merge pull request #786 from wolfman2000/wolf-posix-fadvise
Re-implement the check for HAVE_POSIX_FADVISE.
2015-09-19 12:38:44 -04:00
Jason Felds 5313a880e2 Re-implement the check for HAVE_POSIX_FADVISE.
It is unclear why this was removed.

If this needs to be removed again, either do so through the config file or the definition checks.
2015-09-19 11:30:38 -04:00
Jason Felds 7535961cc1 Merge pull request #785 from wolfman2000/wolf-windows-post-build
Restore mapconv post operations.
2015-09-19 10:57:30 -04:00
Jason Felds b85c61b89e Restore mapconv post operations.
Clearing the cmake cache may be required.
2015-09-19 10:42:46 -04:00
Jason Felds 8ed5305581 Merge pull request #783 from Prcuvu/remove_jpeg_lib
Since libjpeg is built from source on Windows, the old jpeg.lib should be removed.
2015-09-19 07:02:47 -04:00
Jason Felds 59499a7f6b Merge pull request #782 from wolfman2000/wolf-rstring-buffer-removal
Remove the need for the RString buffer.
2015-09-17 22:32:23 -04:00
Jason Felds cf545a3c01 Remove the need for the RString buffer.
For most areas, the call to `c_str()` is plenty.

For `RageUtil`, it's just a matter of new and delete.
2015-09-16 22:29:53 -04:00
Jason Felds b87af92a6b Merge pull request #476 from forsureitsme/patch-1
Removed redundant code at Noteskins/pump/default/Noteskin.lua
2015-09-16 06:28:57 -04:00
Jason Felds 9140b836cc Merge pull request #778 from wolfman2000/wolf-libjpeg-jconfig
Allow proper compiling of libjpeg for windows.
2015-09-15 18:29:18 -04:00
Jason Felds 381ab3b655 Merge pull request #780 from wolfman2000/wolf-vs2015-snprintf-compile
Allow VS2015 to compile StepMania.
2015-09-15 06:49:54 -04:00
Jason Felds 4feddab08e Allow VS2015 to compile StepMania. 2015-09-14 22:45:56 -04:00
Jason Felds 95d73e9df1 ...these other files were command line programs.
They are not needed here.
2015-09-13 13:30:41 -04:00
Jason Felds 66b371a6bb Corrections to the jpeg compilation fix.
* Only compile one memory manager.
* Remove the no longer used jpeg.dll file.
2015-09-13 13:27:06 -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 34ba6e37c4 Merge pull request #775 from wolfman2000/wolf-with-other-audio-off
Allow changing WAV and OGG settings for all OSes.
2015-09-12 12:12:05 -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 e103bf286f Merge pull request #774 from wolfman2000/wolf-with-mp3-off
Improve and enhance WITH_MP3.
2015-09-12 11:36:49 -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 e7b3011058 Merge pull request #773 from wolfman2000/wolf-tomcrypt-portable
Switch portable tomcrypt to ON by default.
2015-09-11 17:03:28 -04:00
Jason Felds 2448e67641 Switch portable tomcrypt to ON by default. 2015-09-09 20:47:46 -04:00
Jason Felds 0d5a3fdfc1 Merge pull request #769 from wolfman2000/wolf-locale-chaos
Attempt to fix compiling for Windows JP users.
2015-09-08 17:15:31 -04:00
Jason Felds 4149191b54 Attempt to fix compiling for Windows JP users. 2015-09-08 16:57:56 -04:00
Jason Felds 0b2a31491c Merge pull request #768 from wolfman2000/prcuvu-libmad-windows-src
Allow libmad to be compiled in Windows.
2015-09-08 16:55:21 -04:00
Jason Felds 381870f9ea Allow libmad to be compiled in Windows.
This removes the need for an externally built library, thus officially removing the deprecated Xbox projects.

Other minimal changes were made to ensure consistency. Comments will be made in the PR.

Thanks to @Prcuvu for the initial push.
2015-09-07 09:50:01 -04:00
Jason Felds b3c8f28c9d Merge pull request #765 from wolfman2000/wolf-cmake-feature-detection
Use proper cmake detection of features.
2015-09-06 09:08:13 -04:00
Jason Felds 2cbec13c5a Merge pull request #766 from wolfman2000/wolf-travis-container
Switch to travis's container infrastructure.
2015-09-06 09:05:33 -04:00
Jason Felds 70375a7e26 ...I forgot libvorbis? Re-verify. 2015-09-06 08:52:24 -04:00
Jason Felds e488674987 Whitespace fix. 2015-09-06 08:40:37 -04:00
Jason Felds 02a443460e Switch to travis's container infrastructure.
Alledgedly, we'll get faster builds and performance. Considering how complex this repository is, it's worth trying. Note that sudo calls are not allowed with this container format at this time.
2015-09-06 08:33:30 -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 89683e0e7c Merge pull request #761 from Prcuvu/use_vs_implemented_functions
Use Visual Studio implemented functions.
2015-09-01 20:23:59 -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 76d07bca14 Merge pull request #730 from wolfman2000/wolf-timing-window-ticks
Partial revert of b61e878.
2015-07-19 22:12:28 -04:00
Jason Felds 23d9271307 More accurate timing based on chart data.
Thanks to Skypers for the assist.
2015-07-19 22:09:34 -04:00
Jason Felds 960af12c23 Partial revert of b61e878.
Pump holds do have a little bit of leeway when it comes to letting go and putting your foot back on as proven by [WinDEU's demonstration of Dignity S20](https://www.youtube.com/watch?v=P2Fw9KPyHIg&feature=youtu.be&t=30).

The value used was determined by two video sources: the one mentioned above and a private one sent to me involving a different song/chart combination. 200ms is a rough estimate for what works. There may be other allowed values.
2015-07-19 16:08:50 -04:00
Jason Felds e7ba881168 Update cmake comments. 2015-07-12 07:31:38 -04:00
Jason Felds eca10c363c Merge pull request #720 from HirotakaTakayama/document_patch2
Add example information: Build/README.md.
2015-07-11 21:04:18 -04:00
Jason Felds 46ac2bd63b Merge pull request #719 from HirotakaTakayama/document_patch1 2015-07-11 12:47:02 -04:00
Jason Felds 358712b0ff Merge pull request #710 from wolfman2000/wolf-cmake-output-names
Use the more appropriate output name properties.
2015-07-02 22:11:11 -04:00
Jason Felds 4eb39ac38c Use the more appropriate output name properties.
Now Linux can join in on different binary names.
2015-07-02 21:51:37 -04:00
Jason Felds 1e3bb0a10e Merge pull request #709 from wolfman2000/wolf-cmake-indexing
Use list(FIND) to have more flexible lists.
2015-07-02 21:14:03 -04:00
Jason Felds 09621811e8 Use list(FIND) to have more flexible lists.
If Travis builds this, then we know it is solid.
2015-07-02 20:52:03 -04:00
Jason Felds d1ce427a19 Merge pull request #708 from wolfman2000/wolf-xcode-old-readme
Remove deprecated XCode project. Update README.
2015-07-02 20:45:19 -04:00
Jason Felds aaba7c6e23 Remove deprecated project. Update README.
There was nothing absolutely necessary to bring in to the cmake version from what I can tell.
2015-07-02 20:23:06 -04:00
Jason Felds 42ad044817 Linux broke somehow. Restore it with system jpeg. 2015-06-19 20:53:13 -04:00
Jason Felds 3bd182b523 Potential holy war, but use UTF-8 always. 2015-06-10 18:09:27 -04:00
Jason Felds 5a1f3433bc Merge pull request #673 from wolfman2000/wolf-checkpoint-m-only
Require reasons for checkpoints.
2015-06-08 19:00:43 -04:00
Jason Felds 80542a5a7d Require reasons for checkpoints. 2015-06-08 18:37:13 -04:00
Jason Felds 07c773fe2b Merge pull request #664 from wolfman2000/wolf-bundle-warning-fix
Fix bundle warning.
2015-06-02 20:09:28 -04:00
Jason Felds 999fdfee5a Fix bundle warning. 2015-05-29 09:36:22 -04:00
Jason Felds c5e4f3fca8 Add diffmerge files to gitignore. 2015-05-26 10:36:57 -04:00
Jason Felds 441075a532 We forgot about the generated stuff @cybik. 2015-05-25 15:51:11 -04:00
Jason Felds 26b6738913 Merge pull request #658 from stepmania/toolchain-prep
Modularize build system
2015-05-25 13:41:21 -04:00
Jason Felds 5a6291e887 Merge pull request #657 from stepmania/crash-manager-linux-back
Reactivating Crash Manager on the Linux platform
2015-05-25 13:33:44 -04:00
Jason Felds 21b80aaca3 Merge pull request #656 from stepmania/verstub-is-gone
Alter verstub generation
2015-05-25 13:21:49 -04: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 57ebdd87fb Fix Release With Debug Info 2015-05-25 11:56:40 -04:00
Jason Felds 130ce32784 Merge pull request #651 from wolfman2000/wolf-cmake-license-file-change
Put the license file in the CMake folder.
2015-05-24 21:18:50 -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 266ac4ef92 Merge pull request #635 from wolfman2000/wolf-libva-builtin
Try to not need WITH_LIBVA.
2015-05-20 19:37:17 -04:00
Jason Felds 57ad9e1eba Ensure Ubuntu core dumps never get added. 2015-05-19 22:09:29 -04:00
Jason Felds b934a25cb2 Try to not need WITH_LIBVA. 2015-05-19 20:08:15 -04:00
Jason Felds a000732c2c Merge pull request #615 from nixtrix/previewlength2
Setting sample length for songs with preview file to 0 uses length of preview file
2015-05-18 23:11:22 -04:00
Jason Felds e85162df7a Merge pull request #614 from nixtrix/changelog
Updated the changelog with all the new changes I've made
2015-05-18 23:09:58 -04:00
Jason Felds c3b468382d Merge pull request #613 from dguzek/OSX-Loading-Splash
fix LoadingWindow splash image for OS X
2015-05-17 22:02:31 -04:00
Jason Felds b756db459e Don't allow any .a files in general.
If they must be added, force them from here on.
2015-05-13 21:05:18 -04:00
Jason Felds aa53504530 Ignore generated CodeLite files.
Yes, trying to branch out slightly.
2015-05-13 19:00:46 -04:00
Jason Felds 736e68e6e9 Merge pull request #597 from jobn/cmakefindjack
Added missing lines of FindJACK.cmake - now finds JACK successfully
2015-05-11 16:59:02 -04: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 1578072d4d Don't break up -G and the generator. 2015-05-09 15:05:16 -04:00
Jason Felds da2c5921bc Use portable tomcrypt for Travis for now. 2015-05-09 14:53:06 -04:00
Jason Felds 215cf4265c Verify both cmake and stepmania install.
This comes from http://docs.travis-ci.com/user/installing-dependencies/
2015-05-09 14:35:08 -04:00
Jason Felds 0b49ae773f Attempt a manual cmake installation for Travis.
If any dependencies are missing, we should be notified.
2015-05-09 14:12:05 -04:00