Commit Graph

50 Commits

Author SHA1 Message Date
Ian Brown a1a6374709 Build: Changes required to compile and run using VS 2019 (#2975)
in vs 2019, the system xhash used by unordered_map uses Target in its template definition. pcsx2 #defines this in the r5900 and r3000 headers which leak cause a cryptic compilation error. A quick fix here is just to undef it in gamebase.h. A better fix would be to encapsulate the definition or use something more c++ to avoid the pre-processor. Add a comment to explain the _Target_ undef.

tap.h did not have string defined. I guess this was included transitively somewhere with an earlier set of system headers.

Biostools, the file is opened in text mode which causes the bios to be partially read. I'm not sure that's vs2019 specific but it's wrong in any case. Maybe the default mode parameter changed at some point. Maybe wxFile would be a better choice here rather than WxFFile because wxFile always open s in binary mode.
2019-06-01 13:34:21 +02:00
Daniel Nowak a84a315473 Dev9ghzdrk: Get host mac correctly on Windows. (#2619)
Follow up from #2586 which ensures that MAC address is unique on Xlink Kai when using Windows.
Previous build was returning last two bytes as 00:00 rather than last two bytes of host adapter's MAC.
2018-10-09 20:37:41 +02:00
Daniel Nowak da1eb056a3 Add network capability for Linux (#2586) 2018-10-02 21:37:34 -07:00
Jonathan Li e25e8bc580 plugins: Tidy/standardise VS projects
Combine all the different configurations together so the project files
are more generic and maintainable.

Also standardise the layout so all the project files will be similar and
all have the same standard elements (even if empty).

Add 64-bit configurations.

Additional specifics:
spu2-x: FLOAT_SAMPLES preprocessor definition removed since it's unused.
2016-07-19 23:25:12 +01:00
Jonathan Li b20433c0be windows: Remove user.props references from all projects
find . -name *.vcxproj -exec sed -i -e '/user.props/d' {} \;

Microsoft recommends against using .user files. From
https://msdn.microsoft.com/en-us/library/669zx6zc.aspx :
"The best practice is to delete the reference to them in Property
Manager to ensure that your projects operate independently of any
per-user, per-computer settings. This is important to ensure correct
behaviour in a SCC (source code control) environment."

If you cannot compile SPU2-X after this commit (since that still relies
on the old DirectX SDK), you'll need to fix your build environment.
2016-05-29 12:21:52 +01:00
Jonathan Li 9ed9b2d8cd windows: Switch to DefaultPlatformToolset aka non-XP toolsets
Basically I ran
find . -name "*.vcxproj" -exec sed -i -e 's/_xp//' {} \;

This will likely break XP, but it paves the way on Windows for a PCSX2
that does not require the DirectX redistributables to be installed for
Windows 8, 8.1 and 10 users. Windows Vista and 7 users will still require
the DirectX redistributable files for XInput and XAudio, though PCSX2
should still be capable of running if a user does not actually use either
of them.
2016-03-13 12:04:28 +00:00
TheLastRar 4a24b434ce Disable Ethernet support if loading adapter fails. 2015-11-17 18:30:42 +00:00
TheLastRar 11e67c9db0 Check if WinPcap initialised correctly
Don't start the RX thread if it hasn't.

Also additional null checks to prevent crashes.
2015-11-14 14:25:34 +00:00
Miguel A. Colón Vélez 3193eb5106 Update .gitignore file.
- Remove *.mo. Not needed.
 - Add *.aps and delete USBqemu.aps.
 - Don't ignore asm files.
 - Ignore the cmake obj-i586-linux-gnu build folder in Linux.
 - Fix the regex pattern for /bin/pcsx2*
 - Don't ignore the changelog of libjpeg.
 - portaudio line not needed and ignored vcxproj/props/etc.
 - update to the new rcdefs.h location
 - Don't ignore pcsx2/gui/Resources/EmbeddedImage.h
 - Remove autogenerated file plugins/dev9ghzdrk/Win32/postBuild.cmd
 - Simplify lines using '**' or '*.exe'.
Remaining issues:
$ git status --ignored
Ignored files:
 plugins/CDVDiso/src/mkiso/mkiso.dsp
 plugins/CDVDiso/src/mkiso/mkiso.dsw
.
These can be deleted.
2015-08-19 07:45:02 -04:00
Miguel A. Colón Vélez a1de0614d7 Remove vs2012 files.
It does not support several things from C99/C++11 that are
used in the project.
2015-08-18 01:15:51 -04:00
Miguel A. Colón Vélez 277217353e Rename files. 2015-08-18 00:44:35 -04:00
Miguel A. Colón Vélez 1fe5aceded Enable round-tripping.
- Remove ToolsVersion
- Use $(DefaultPlatformToolset)_xp until XP support is dropped.
Note: opencl had no XP support and was not enabled in VS2012.
2015-08-18 00:44:19 -04:00
Miguel A. Colón Vélez 6462393aaf Introduce end-of-line normalization
Signed-off-by: Gregory Hainaut <gregory.hainaut@gmail.com>
2015-08-04 23:52:48 +02:00
refractionpcsx2 854403af81 Merge pull request #654 from TheLastRar/empty-ethernet-setting-crash
Dev9ghz: Fix crash when ethernet adapter is not selected
2015-07-12 22:34:04 +01:00
TheLastRar ebafb24099 dev9ghz: proper casing 2015-07-12 18:38:23 +01:00
TheLastRar 820323bc1e dev9ghz: Check if user has selected an adapter
Avoid copying from an invalid pointer
2015-07-12 18:37:38 +01:00
refractionpcsx2 819133ee45 dev9ghzdrk: Make the MAC truely unique, fixes issue #552
-Version bump to reflect the awesomeness
-Put most of the mac variables in one place (not that they do much)
2015-06-24 01:36:01 +01:00
TheLastRar dcd477f2b6 dev9ghz: Look in registry for settings first
If settings found in the registry, create ini, fill with settings and
then delete the settings stored in the registry.

If no settings found in registry, load from ini.
2015-06-22 15:13:18 +01:00
TheLastRar 0be0f13acf dev9ghz: delete leftover registry keys 2015-06-19 15:46:51 +01:00
TheLastRar 0d04ee440d dev9ghz: fix a typo... 2015-06-19 15:39:49 +01:00
TheLastRar 5f068ec46a dev9ghz: Use .ini for saving settings
Import settings from the registry if needed.
2015-06-17 19:24:48 +01:00
TheLastRar d0af2033e9 Dev9ghz: Respect user Log dir setting, use PluginLog
for logging as it checks if log file was created/opened successfully
Enable full logging in debug builds.
2015-06-11 23:18:25 +01:00
Gregory Hainaut c3dc51826f Merge pull request #541 from TheLastRar/master
DEV9ghzdrk - thread safer calls to DEV9irq
2015-06-06 10:47:32 +02:00
Gregory Hainaut ba5b367ae8 drop support of Visual Studio 2010
* Severals PR uses C++11 features
* 2015 will soon be released
* Win 10 will soon be released

Time to upgrade
2015-06-04 08:55:22 +02:00
TheLastRar 66b08c0b2f Use Mutex to control writes to the RX_Frame counter
A user on http://obsrv.org had an issue with freezing, unfreezing than
dying on other players screen, but can continue playing anyway. This
comment didn't end up fixing the issue of becoming a ghost, but he
didn't freeze.
2015-05-28 20:22:38 +01:00
TheLastRar ff4cf51494 use volatile 2015-05-14 13:23:09 +01:00
TheLastRar a0ec633c46 Provide a DEV9async and use it to call irq 2015-05-13 10:04:04 +01:00
TheLastRar 80b24f8055 Fix warped read code 2015-01-27 15:16:06 +00:00
Tom Burnett a1a1c7d0fb Removed svn rev inc file 2014-10-12 01:43:30 -07:00
Tom Burnett 1f734a69a0 Small VS2013 fixes 2014-10-12 01:40:40 -07:00
David Quintana 764ca25f8d Merge pull request #120 from lioncash/dev9ghzdrk
DEV9ghzdrk: Clarify precedence for a bitwise AND in smap.
2014-07-15 11:53:27 +02:00
David Quintana e2f4fc245a Merge pull request #127 from lioncash/dev9-warnings
dev9ghzdrk: Fix a few warnings.
2014-07-15 11:49:37 +02:00
Lioncash b5f805fc6c dev9ghzdrk: Fix a few warnings.
Mostly unsigned mismatches.
2014-07-14 23:41:51 -04:00
Lioncash 55c8633f9a dev9ghzdrk: Remove unreachable code.
Same as what is in the default switch cases
2014-07-14 23:26:31 -04:00
Lioncash 69ecdd3236 DEV9ghzdrk: Clarify precedence for a bitwise and in smap. 2014-07-14 20:49:03 -04:00
Coldbird 002dc80d48 Fixing DEV9 Adapter Detection 2014-06-05 12:33:43 +02:00
Peter Tissen ad9ec44228 prevent null dereference if no network device is selected in dev9 2014-05-24 22:12:26 +02:00
Gregory Hainaut 86895cbf45 pcsx2 license: add missing nice header on various files
Remains 3 files that I don't know the source
pcsx2/windows/DwmSetup.cpp: *No copyright* UNKNOWN
pcsx2/windows/SamplProf.cpp: *No copyright* UNKNOWN
pcsx2/windows/VCprojects/IopSif.cpp: *No copyright* UNKNOWN

Remains 1 files in common that I don't know the source
common/include/comptr.h: *No copyright* UNKNOWN

Remains too much files in plugins that I don't know the source :(
2014-04-11 09:18:30 +02:00
gigaherz 888f0a27da Remove vs2008 project files, since they have become outdated, and complicated to maintain.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5902 96395faa-99c1-11dd-bbfe-3dabce05a288
2014-02-15 18:24:06 +00:00
gigaherz 01daa0b6fd Change the vs2012 project files to use the v110_xp platform toolset, and the vs2013 project files to use the v120_xp platform toolset, so that the resulting executables can be run in Windows XP/2003.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5822 96395faa-99c1-11dd-bbfe-3dabce05a288
2014-01-24 15:30:34 +00:00
gigaherz 4173080028 Because vs2012==vs11 and vs2013==vs12, which is extremely confusing, I renamed the project files to use the full year as the name.
Also fixed some project references to the right filenames.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5764 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-11-27 16:53:36 +00:00
gigaherz 74378ce378 Created vs2013 files based on the vs2012 code, and fixed a small incompatibility between vs2013 and pthreads.
Removed some missing headers from the vs2010 and vs2012 project files that were causing vs to always claim the projects were out of date.
Also removed some other entries for c/cpp files that were disabled but also missing (I did not search exhaustively).


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5763 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-11-27 16:44:32 +00:00
gabest11 ddaa892726 Removed ATL/MFC dependencies from every project, the free version of visual studio does not have those. It compiles with vs2012 express now, will fix others later, in case they are broken.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5692 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-07-01 21:28:58 +00:00
ramapcsx2.code 51fc6dbd07 Added Visual Studio 2012 solution files for DEV9ghzdrk and avoided a macro redefinition error in WinPcap when that compiler is used.
VS2008 is harder to do as there is no automatic downgrader tools for the solution files, sorry.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5602 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-03-20 16:34:31 +00:00
ramapcsx2.code a6f5ac4720 DEV9ghzdrk:
Changed the stack init hack so it is consistent on plugin resets and removed a part of it that broke OPL.
Hopefully this works for all use cases, but we should fix the initial problem anyway.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5601 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-03-20 14:50:56 +00:00
ramapcsx2.code 447d7152b5 DEV9ghzdrk: Re-enabled the stack init hack, fixing GT4 network use.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5600 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-03-20 14:07:31 +00:00
ramapcsx2.code e32a18dac4 Added WinPcap to the library of 3rd party includes and made DEV9ghzdrk use them.
WinPcap version is 4.1.2 and only the /include and /lib folders of their developer pack are included.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5599 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-03-20 13:58:00 +00:00
ramapcsx2.code 2e6917c409 DEV9ghzdrk: Either be thread safe in the whole plugin or don't try to at all.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5597 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-03-19 23:08:29 +00:00
ramapcsx2.code 6ac678d34f DEV9ghzdrk: These files aren't needed.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5596 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-03-19 22:21:48 +00:00
gigaherz 90f0da8ec2 Include dev9ghzdrk into the main plugins folder, and integrate it into the build system (windows only).
Most of the work done by Rama, I just integrated the vcxproj.

Only done for vs2010, vs2008 or vs2012 will have to wait.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5595 96395faa-99c1-11dd-bbfe-3dabce05a288
2013-03-19 22:01:41 +00:00