Jason Felds
3d6ef83a88
Ensure we get properly ranked courses.
2015-10-18 09:19:56 -04:00
Jason Felds
a38c042dfd
Merge pull request #885 from wolfman2000/wolf-sextet-all-oses
...
Allow all OSes to use the Sextet light drivers.
2015-10-17 23:12:51 -04:00
Jason Felds
8f902bed7d
Allow all OSes to use the Sextet light drivers.
...
This is meant to enhance #343 .
2015-10-17 22:49:44 -04:00
Jason Felds
16c6e9aec3
Fix loading WORST courses.
2015-10-17 20:14:55 -04:00
Jason Felds
af29d7dab2
Bring from 5_1_0: don't use insert with RString.
2015-10-14 20:23:40 -04:00
Jason Felds
849df4975b
Fix appveyor for sending failure noticifcations.
2015-10-12 19:03:30 -04:00
Jason Felds
de1313ab4d
Merge pull request #855 from wolfman2000/wolf-linux-backtrace
...
Backtrace stuff ahoy!
2015-10-08 20:10:29 -04:00
Jason Felds
56ebd4cd08
Merge pull request #856 from wolfman2000/wolf-ffmpeg-attribute-deprecation
...
FINALLY shut ffmpeg up!
2015-10-08 20:10:16 -04:00
Jason Felds
f372df0d2c
Allow building with backtrace symbols.
2015-10-08 19:46:52 -04:00
Jason Felds
c05e38c0aa
...I forgot to commit the new file.
2015-10-08 19:33:52 -04:00
Jason Felds
41a2d829e4
FINALLY shut ffmpeg up!
...
In all seriousness, no need for this definition anymore.
2015-10-08 19:06:26 -04:00
Jason Felds
98bf0d739b
Merge pull request #852 from Prcuvu/linux_fix_warnings
...
Fix GCC warnings on Linux.
2015-10-08 18:54:16 -04:00
Jason Felds
6f53f1c3e5
Backtrace stuff ahoy!
...
* Properly detect and utilize libdl.
* Set the backtrace method appropriately.
* Remove an unused backtrace format. No references existed.
2015-10-08 18:42:44 -04:00
Jason Felds
143347a873
Merge pull request #854 from wolfman2000/wolf-wav-buffer
...
Fix keysounds (and other WAV files).
2015-10-08 17:26:48 -04:00
Jason Felds
e0b32ad3db
Fix keysounds (and other WAV files).
...
Bloody off by one error.
2015-10-08 17:13:33 -04:00
Jason Felds
0b52c51eab
Merge pull request #850 from wolfman2000/wolf-windows-song-caching
...
Backport "for each" loop to restore AppData cache.
2015-10-07 21:20:41 -04:00
Jason Felds
63387dc352
Backport "for each" loop to restore AppData cache.
2015-10-07 21:07:09 -04:00
Jason Felds
cb11d9aee9
Merge pull request #848 from wolfman2000/wolf-windows-stricmp-removal
...
Use cmake to determine which string func we need.
2015-10-07 19:11:21 -04:00
Jason Felds
d9a3c9cf97
Use cmake to determine which string func we need.
...
On a side note, better to default to linux names when possible.
2015-10-07 19:00:16 -04:00
Jason Felds
f441d3a6f7
Fix Mac OS X build.
2015-10-06 20:18:01 -04:00
Jason Felds
d9dbb854d2
Merge pull request #841 from wolfman2000/wolf-appveyor-fork-url
...
Try being more flexible with appveyor's URLs.
2015-10-06 19:48:27 -04:00
Jason Felds
3aa74b221d
Try being more flexible with appveyor's URLs.
2015-10-06 19:38:46 -04:00
Jason Felds
20170a6e95
Merge pull request #840 from wolfman2000/wolf-appveyor-sanity-rev2
...
Get continuous integration working on windows.
2015-10-06 17:41:38 -04:00
Jason Felds
4a4175ce9a
Get continuous integration working on windows.
...
Using appveyor for the initial tryout. Currently dealing with issues on getting github to recognize the pull request commits.
The token in place is a double secured token: it can be replaced quickly if necessary.
2015-10-06 16:55:38 -04:00
Jason Felds
74fb2a1a53
Merge pull request #803 from Prcuvu/binaries_cleanup
...
Cleaning up deprecated binaries and VS projects.
2015-10-06 16:47:59 -04:00
Jason Felds
dd0d2ed67f
Merge pull request #839 from Prcuvu/read_dxsdk_dir_env
...
Read DirectX SDK path from environment variable.
2015-10-06 16:43:09 -04:00
Jason Felds
fa2f3232be
Add the AppVeyor (window) status.
2015-10-05 17:42:22 -04: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
67a52139f7
Merge pull request #331 from lthls/ffmpeg-fix
...
FFMpeg: Fix uninitialized AVFrame
2015-10-04 16:40:08 -04:00
Jason Felds
c79dd4ba5c
Update changelog: FFmpeg on windows edition.
2015-10-04 14:56:02 -04:00
Jason Felds
a27e3d5b6c
Merge pull request #835 from wolfman2000/wolf-windows-ffmpeg-2.1.3
...
Use ffmpeg 2.1.3 on Windows.
2015-10-04 14:55:14 -04:00
Jason Felds
fdac0835b8
Use ffmpeg 2.1.3 on Windows.
...
Once again, thanks to Zeranoe's builds.
2015-10-04 14:39:07 -04:00
Jason Felds
8de6f4e5f9
Partial revert: see #834 .
2015-10-04 14:36:26 -04:00
Jason Felds
1b559bddf0
Merge pull request #834 from stepmania/revert-832-wolf-ffmpeg-lgpl
...
Revert "Default to GPL off for ffmpeg."
2015-10-04 14:33:19 -04:00
Jason Felds
b0465a8622
Revert "Default to GPL off for ffmpeg."
2015-10-04 14:33:06 -04:00
Jason Felds
8f9b5717ba
Update changelog.
2015-10-04 13:56:11 -04:00
Jason Felds
e83b76cae2
Merge pull request #832 from wolfman2000/wolf-ffmpeg-lgpl
...
Default to GPL off for ffmpeg.
2015-10-04 13:52:31 -04:00
Jason Felds
27ef5301ec
Default to GPL off for ffmpeg.
2015-10-04 12:53:56 -04:00
Jason Felds
6be6d6794c
Merge pull request #830 from lthls/fix-cmake-ffmpeg
...
Fix CMake build with option WITH_SYSTEM_FFMPEG
2015-10-04 11:16:42 -04: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
8b08c7c182
Merge pull request #826 from wolfman2000/wolf-macosx-bzip2-iconv
...
Reference bzip2 and iconv on Mac OS X properly.
2015-10-03 20:57:21 -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
12296352f7
Merge pull request #817 from Prcuvu/lua_remove_unnecessary_file
...
Remove lua.c from CMake project.
2015-10-03 00:27:05 -04:00
Jason Felds
5412fda226
Merge pull request #819 from wolfman2000/wolf-src-cmake-separation
...
Separate out the remaining files.
2015-10-02 23:42:57 -04:00
Jason Felds
ba96ab7570
Separate out the remaining files.
2015-10-02 23:14:24 -04:00
Jason Felds
d14cce6654
Merge pull request #818 from wolfman2000/wolf-verstub-clean-gen
...
Generate verstub.cpp through raw cmake.
2015-10-02 22:33:30 -04:00
Jason Felds
b7c62ee645
Missed a spot on Linux.
2015-10-02 22:18:31 -04:00
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