Commit Graph

1605 Commits

Author SHA1 Message Date
Zach Bacon eaa198b360 Merge pull request #17 from EoD/fix-cmake-for-linux-build
Set requirement to C++11 in cmake
2016-07-31 08:18:16 -04:00
EoD a513d3191e Add C++11 in cmake as default
Currently, the build is broken on Linux as fixed width integers (for
example uint32) are used via <cstdint> without a namespace. This is only
allowed in C++11 and later.

See http://en.cppreference.com/w/cpp/types/integer for details.
2016-07-31 01:03:40 +02:00
EoD 6612d34ddf Fix SDL.h includes
See comment in FindSDL2.cmake:
 Note that the header path has changed from SDL2/SDL.h to just SDL.h
 This needed to change because "proper" SDL convention
 is #include "SDL.h", not <SDL2/SDL.h>. This is done for portability
 reasons because not all systems place things in SDL2/ (see FreeBSD).
2016-07-31 00:11:21 +02:00
EoD 3b520ee202 Add missing OpenGL header
Fixes an issue with GLuint not defined
2016-07-30 23:56:33 +02:00
EoD 645be4522c Add missing wxWidget includes 2016-07-30 23:56:17 +02:00
EoD 6ce43f90b9 Fixes build issue if VERSION has not been defined 2016-07-30 23:55:57 +02:00
EoD 3cf6c2ca7b Fixes memgzio with zlib > 1.2.3.8 2016-07-30 23:55:00 +02:00
EoD 3f5f9adbe9 Update 7z code to SDK 9.22
This fixes some Linux compile errors
2016-07-30 23:53:39 +02:00
Zach Bacon 0573351a65 Merge pull request #15 from ElementW/typemess
Remove typedef'd standard int types
2016-07-29 20:47:14 -04:00
Dorian Wouters 31391e090c
Kill common/Types.h, replace its old typedefs w/ standard types
Fix includes in files using standard int types
Fix wxWidgets UI includes
Silence some unused variable warnings in GBA-arm.cpp macros
2016-07-29 11:07:11 +02:00
Dorian Wouters 37f0e75c45
Fix standard int types, prefix gb {C,H,N,Z}_FLAG with GB_ 2016-07-29 09:45:38 +02:00
Zach Bacon 4d3d2b7951
Gba inline fixed up, will try and get things done during the weekend 2016-07-23 09:32:49 -04:00
Zach Bacon ba57da76cb
You must be getting tired of this. I know I am. 2016-07-23 08:10:45 -04:00
Zach Bacon 8106b77056
Added a todo list 2016-07-23 07:59:34 -04:00
Zach Bacon f86fafbe62 Merge pull request #13 from SwooshyCueb/pr-4
Fix a casting error in GCC 6
2016-07-22 22:09:17 -04:00
Zach Bacon 228c298df6 Merge pull request #14 from MrJman006/patch-1
Fixing U16 and U8 Parameter Types
2016-07-22 22:09:07 -04:00
MrJman006 9dd9fd5d26 Fixing U16 and U8 Parameter Types
It seems like most of the types are moving to fixed width integer types and this file wasn't fully converted.
2016-07-21 22:01:49 -04:00
Markus Kitsinger (SwooshyCueb) b6828f62cf Fix a casting error in GCC 6 2016-07-21 13:27:18 -05:00
Zach Bacon ba3083b538
Expect more of these type of messages till all is done 2016-07-09 22:08:20 -04:00
Zach Bacon 79820311d3
I could go on, but really this is just more typedef removal 2016-07-09 21:38:43 -04:00
Zach Bacon 5f73631f84
Eeprom is done 2016-07-09 17:34:55 -04:00
Zach Bacon 590dd281dd
finished the cheat files 2016-07-09 17:24:11 -04:00
Zach Bacon 44e45acfe7
holy shit these shortcuts, there's no end to this is there? 2016-07-09 15:42:30 -04:00
Zach Bacon f0a4b5e533
bios.cpp done, still a bit to go for the cores 2016-07-09 14:39:27 -04:00
Zach Bacon 1944613131
gb folder is done, next up gba, once this is all up I'm going to look at enhancing the cores 2016-07-09 11:41:31 -04:00
Zach Bacon 1f37311a4a
more and more formating issues, I keep doing it in parts for my own reasons 2016-07-09 10:13:54 -04:00
Zach Bacon 48086ba62f
some more formating things etc 2016-07-09 09:53:13 -04:00
Zach Bacon a49edee427
More changes being made, you'll know when it's over. 2016-07-09 09:24:19 -04:00
Zach Bacon 59577d666f
Finished updating common, next up gb folder 2016-07-08 21:39:29 -04:00
Zach Bacon fa33b8eea4
More changes, things may break until it's done so be advised, git is a moving target 2016-07-08 20:57:21 -04:00
Zach Bacon 32a6d7b494
we are 2016, let's get with the times 2016-07-08 20:46:04 -04:00
Zach Bacon 5bf44d19be
updated standards to webkit standard 2016-07-08 19:59:29 -04:00
Zach Bacon 87bc6ca10a add a .clang-format file to help code formating 2016-07-08 19:39:58 -04:00
DoctorWho11 e64593e063 Merge pull request #12 from andychase/patch-1
Edit sdlStateName, fixing SDL states on a Mac
2016-07-03 17:16:29 -04:00
Andy Chase dfaf44eed9 Edit sdlStateName, fixing SDL states on a Mac
Previously this function returned true for `if(saveDir)` when `saveDir` was simply a zero length string following a branch that returned `/<savepath>` which doesn't work when the user isn't a root user.
2016-06-25 01:30:34 -07:00
DoctorWho11 fa81621ddf Merge pull request #11 from SwooshyCueb/pr-2
Add some header and resource files to CMakeLists.txts (Core+WX)
2016-06-09 21:42:01 -04:00
Markus Kitsinger (SwooshyCueb) 57c619ca13 Add some header and resource files to CMakeLists.txts (Core+WX)
This makes these files show up in generated CodeBlocks projects, which
makes life easier for folks who import into QtCreator.
2016-06-07 15:26:53 -05:00
DoctorWho11 b1c171f417 Merge pull request #10 from SwooshyCueb/master
Kludges for ffmpeg 3.0
2016-04-29 12:44:43 -04:00
Markus Kitsinger (SwooshyCueb) 502de18456 Nonfunctional (but compiler-friendly) kludge for video recording with ffmpeg 3.0 2016-04-26 21:50:57 -05:00
Markus Kitsinger (SwooshyCueb) a3a07d2f56 Some encoders don't like s16 2016-04-26 21:45:52 -05:00
Markus Kitsinger (SwooshyCueb) 029a5fc14b Kludge for audio recording with ffmpeg 3.0 2016-04-26 21:41:30 -05:00
Markus Kitsinger (SwooshyCueb) 3f3c3859c1 Add some defines for ffmpeg 3.0 compatibility 2016-04-26 21:32:38 -05:00
Zach Bacon 48770219fa Minor build fixes cxx11 related 2016-02-20 18:44:49 -05:00
Zach Bacon 7ed85a8c6f Finish committing the remaining gtk3 patch (wip) 2015-12-12 23:23:34 -05:00
Zach Bacon c8343267fc <wip> Migration to SDL2 made possible by galtgendo, gtk changes to follow. 2015-11-18 21:34:38 -05:00
DoctorWho11 5773f37c1f Merge pull request #9 from rkitover/master
more minor improvements for OS X build
2015-11-18 08:26:10 -05:00
Rafael Kitover 3d679c1469 more minor improvements for OS X build
Add Homebrew and MacPorts paths for findings headers and libraries.

Add -x objective-c++ to the C++ compile command so that conditionally
compiled ObjectiveC code for OS X can be supported.

Throw a fatal error if the user tries to enable ENABLE_ASM_CORE,
ENABLE_ASM_SCALERS or ENABLE_MMX on AMD64, as this is not supported yet.

If ENABLE_ASM_SCALERS is enabled, try to find a Homebrew or MacPorts
nasm before using the outdated XCode nasm.

For the future, if the user has only the old XCode nasm which does not
support 64 bit objects and the build is 64 bit, throw a fatal error.

For 32 bit builds with the old XCode nasm, use -f macho instead of -f
macho32, which is used if the version of nasm is > 2.0 .

Pass -DMACHO instead of -DELF and, on AMD64 (for the future) -D__AMD64__
for nasm on OS X.

Pass -D__AMD64__ to C++ compilation as well on AMD64, this will help
when we support AMD64 inline assembly.

Add support for automatically linking Homebrew keg-only gettext from
/usr/local/opt/gettext for ENABLE_NLS.

Fix copying Info.plist and vbam.icns to the .app bundle.

Add a key to the Info.plist to support sharp text on retina displays, as
per:
https://wiki.wxwidgets.org/WxMac-specific_topics#Retina_display_support

Set wxWidgets_USE_DEBUG to ON if CMAKE_BUILD_TYPE is "Debug". I'm not
sure this does anything or if I'm doing this correctly though.

Also set wxWidgets_USE_UNICODE to ON. Again, I'm not sure this does
anything or is in the right place.

Fix a bug in the config dir finding code in
wxvbamApp::GetConfigurationPath() updated in 8b8f2f7 to only use the
more top level dirs if there is a vbam.ini in them, not if they are
writable as well, and use the reverse order (starting with user local
dirs) to check for writable dirs and their writable parents. This fixes
a problem with the vbam.ini being written to the Plugins directory of
the .app bundle if it's writable instead of ~/Library/Application
Support/vbam as was intended.
2015-11-16 21:56:23 -05:00
DoctorWho11 c3574c543c Merge pull request #8 from rkitover/master
fix configuration directory on OSX
2015-11-09 15:39:04 -05:00
Rafael Kitover 8b8f2f7a14 fix configuration directory on OSX
Write vbam.ini to ~/Library/Application Support/vbam on OSX.

Do not create ~/.vbam on OSX in common/ConfigManager.cpp .

Make get_config_path and wxvbamApp::GetConfigurationPath return
directories with a writable parent in reverse search order when no
writable directories in the current search order are available since the
directory is created in OnInit.

This prefers to create the user-local directory and write the vbam.ini
there.
2015-11-09 02:11:18 -05:00
DoctorWho11 3fac31acb5 Actually display the commit version. However may shorten it since it displays the full string. 2015-10-23 22:21:39 -04:00