actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
35,068 Commits 3 Branches 0 Tags
27ef5301eccfe013e965d9247b4308bcdb4c4687
Commit Graph
35068 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Vincent Laviron 93cc62f0ad Fix CMake build with option WITH_SYSTEM_FFMPEG 2015-10-04 16:38:08 +02:00
Kyzentun 8e7b4ee7ee Merge pull request #203 from kyzentun/FixScaleToClipped 
Rewrote Sprite::ScaleToClipped and CropTo to actually work.
 2015-10-03 21:31:45 -06:00
Dan Guzek 232f6537f9 Merge pull request #827 from wolfman2000/wolf-macosx-ffmpeg-proper 
Finally bring ffmpeg 2.1.3 to Mac OS X.
 2015-10-03 23:12:14 -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
hanubeki 09d2cda3eb ja: [ScreenEdit] save_success_no_sm_split_timing 2015-10-03 12:01:27 +09: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
Kyzentun Keeslala 2d64694f14 Changed Song and ScreenEdit to not save a .sm file when split timing is used. 2015-10-02 16:26:59 -06:00
Prcuvu 457adef083 Remove lua.c from CMake project. 2015-10-02 19:10:03 +08:00
Kyzentun Keeslala 751caba360 Why did I use >= originally? That makes no sense. 2015-10-02 03:09:05 -06: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
Kyzentun Keeslala a10c0c4f01 Added set_use_effect_clock_for_texcoords to Sprite. Updated changelog. 2015-09-21 20:42:56 -06: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
Prcuvu 4ca2ea289f Remove old jpeg.lib. 2015-09-19 15:40:13 +08:00
Kyzentun bb99481363 Merge pull request #772 from waiei/fix_hold/0609 
fix draw hold body inactive texture bug
 2015-09-18 18:35:32 -06:00