Commit Graph

3626 Commits

Author SHA1 Message Date
unknown 8185799939 spacing 2015-11-23 21:23:02 -05:00
Julio C. Rocha f8b260c2f1 Omit toolset _xp suffix if using VS older than 2012 2015-11-23 17:08:44 -08:00
Julio C. Rocha 02cfc54d8d Ignore High-DPI setting when using VS 2008 toolset. 2015-11-23 16:43:10 -08:00
zilmar 6977f311de Merge pull request #775 from Frank-74/patch-3
Update Settings.h new path
2015-11-23 07:55:26 +11:00
Frank-74 48eda9ab5a Update Settings.h new path 2015-11-22 20:52:54 +00:00
zilmar b71414454d Merge pull request #774 from cxd4/revert-769
reverting #769

I tried to get it working in vs2008, but I failed, best to revert
2015-11-23 07:31:04 +11:00
unknown a1b88bdd5f reverting #769 2015-11-22 12:55:23 -05:00
zilmar fa60e55f57 [Project64] Trying to get wx to compile 2015-11-22 22:36:51 +11:00
zilmar b5a4dc4eef Merge pull request #769 from JunielKatarn/wx_3.0
Upgrade wxWidgets to version 3.0.2
2015-11-22 16:58:28 +11:00
zilmar f994f38e75 Merge pull request #771 from Frank-74/patch-2
Fix Save State (F7)
2015-11-21 15:03:28 +11:00
Frank-74 26f9576eea Fix Save State (F7) 2015-11-21 03:37:56 +00:00
zilmar 8139985ba2 Merge pull request #765 from cxd4/fix-763
[ROM Browser] fixed issue #763
2015-11-21 13:36:33 +11:00
zilmar 7819be71a7 Merge pull request #770 from Frank-74/patch-1
Fix status bar load/save text.
2015-11-21 08:17:44 +11:00
Frank-74 6007d9bce0 Fix status bar load text. 2015-11-20 21:15:31 +00:00
Frank-74 8d8c52fac4 Fix status bar save text 2015-11-20 21:05:25 +00:00
Julio C. Rocha b94dc49eef Updated wx/png source to wx 3.0.2 2015-11-18 21:41:00 -08:00
Julio C. Rocha 9629d70b10 Cleaned up Platform.props and wx/core,base vcxproj.filters 2015-11-18 14:58:53 -08:00
Julio C. Rocha bc9942d164 Cleaned up wx/core,base VCXPROJ files. 2015-11-18 14:41:11 -08:00
Julio C. Rocha db151b6c53 Upgraded wx/base VCXPROJ to 3.0.2 2015-11-18 13:53:09 -08:00
zilmar d7fcb17928 Merge pull request #768 from cxd4/gcc-rsp
Improve RSP MinGW linker configuration.
2015-11-19 08:17:15 +11:00
unknown da2b2184e6 [RSP] Link against resource script for RSP debug UI. 2015-11-18 14:18:13 -05:00
unknown dd7242f52a [RSP] Link against Project64 "Common" static library. 2015-11-18 13:58:42 -05:00
unknown 932969f9a8 [RSP] Set Windows subsystem entry point for MinGW. 2015-11-18 13:57:14 -05:00
zilmar 5008c7f024 Merge pull request #766 from cxd4/plz-dont-do-this
fixed impossible arithmetic condition
2015-11-18 19:51:21 +11:00
Julio C. Rocha fd734e350e Updated wx_core VCXPROJ to version 3.0.2 2015-11-17 18:59:38 -08:00
Julio C. Rocha 3b0ea85d6c Added wx/xrc sources 2015-11-17 18:58:43 -08:00
unknown 703b3b4234 [ROM Browser] Do not strtoul(very large strings). 2015-11-17 21:56:31 -05:00
unknown 4fb000462a [ROM Browser] removed extraneous copy of call to strtoul() 2015-11-17 21:28:41 -05:00
unknown 96bd77edcc [ROM Browser] fixed impossible arithmetic condition 2015-11-17 21:27:41 -05:00
zilmar 839fda1e0e Merge pull request #764 from cxd4/undeclared-ASSERTE-macro
[Common] Have fallback to including nonstandard <crtdbg.h>.
2015-11-18 06:36:32 +11:00
unknown 48a077c8e8 [Common] Have fallback to including nonstandard <crtdbg.h>. 2015-11-17 13:31:36 -05:00
zilmar ea0791c55d Merge pull request #762 from MELERIX/english
missing from: c44ecf09fa
2015-11-17 17:21:29 +11:00
MELERIX 7976bf832a unneeded 2015-11-17 02:08:16 -03:00
MELERIX 6edfcbd77b Merge https://github.com/project64/project64 into crapware 2015-11-17 01:34:39 -03:00
MELERIX c73d4844fa missing from: c44ecf09fa 2015-11-17 01:28:18 -03:00
zilmar a71f56030e Merge pull request #761 from cxd4/common-mingw
[Common] uploaded working MinGW build script
2015-11-17 14:27:26 +11:00
unknown e9a8649573 [Common] uploaded working MinGW build script 2015-11-16 22:18:43 -05:00
zilmar 9d59d36338 Merge pull request #760 from cxd4/unresolved-alloca
[Common] #include <malloc.h> to fix undeclared `alloca`
2015-11-17 14:18:25 +11:00
unknown c5114d820c [Common] #include <malloc.h> to fix undeclared `alloca` 2015-11-16 21:46:54 -05:00
zilmar 6559d36f41 Merge pull request #759 from cxd4/fix-nrage
Get N-Rage linking with MinGW 64-bit.
2015-11-17 13:20:12 +11:00
zilmar c218d17eac Merge pull request #739 from cxd4/contr-1_1-specs
"fixed" implementation of Controller 1.1 specifications
2015-11-17 13:19:45 +11:00
unknown dc65c0a075 Resolve merge conflicts from `Controller Plugin.cpp`. 2015-11-16 21:01:54 -05:00
unknown 6fd2fa0f4a [N-Rage] Get resource script linked w/ MinGW for config GUI. 2015-11-16 20:27:44 -05:00
unknown 1f233320ba [N-Rage] Include windows.h, not wtypes.h, for Windows API types.
<wtypes.h> may include all the BOOL/DWORD/etc. stuff as a low-level MSVC header, but it is not obligated to do so per the low-level header specifications for other compilers, such as (evidently) MinGW.
2015-11-16 19:12:57 -05:00
unknown 5af1cfd3c2 [N-Rage] only need WBEM dependency in 1 .cpp, not a .h 2015-11-16 18:47:26 -05:00
unknown 0e67591be6 [N-Rage] fixed ARRAYSIZE() #define when missing headers
The old code only cared about if the macro was already defined (then #undef and re-define it).  If it was NOT already defined, it just ignored the problem and causes unresolved compile-time symbols.
2015-11-16 18:30:11 -05:00
unknown 61866f5b04 [N-Rage] MinGW links with -ldinput8, -mwindows and subsets. 2015-11-16 16:30:21 -05:00
zilmar a0ac5d6d33 Merge pull request #758 from cxd4/CIC-DMA-use-SW
Express initial CIC DMA poke in terms of the SW operation.
2015-11-17 05:03:31 +11:00
unknown 72d63ae62c Move all the repeated stuff out from every switch case. 2015-11-16 10:21:50 -05:00
unknown 9803d3fb01 Don't force pointer aliasing risks; just call SW. 2015-11-16 10:13:36 -05:00