From 258c784989b5c108dbefd230297d33c00e474c10 Mon Sep 17 00:00:00 2001 From: darkstar Date: Tue, 8 May 2018 01:00:14 +0200 Subject: [PATCH 1/2] Fix some relative include paths --- src/devices/sound/snd_dbopl.cpp | 2 +- src/win/win_opendir.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/devices/sound/snd_dbopl.cpp b/src/devices/sound/snd_dbopl.cpp index c90b138..8aeb4a7 100644 --- a/src/devices/sound/snd_dbopl.cpp +++ b/src/devices/sound/snd_dbopl.cpp @@ -44,7 +44,7 @@ # include # include # include -# include "../emu.h" +# include "../../emu.h" #endif #include "dbopl.h" #include "nukedopl.h" diff --git a/src/win/win_opendir.c b/src/win/win_opendir.c index a0a7bda..ea4e246 100644 --- a/src/win/win_opendir.c +++ b/src/win/win_opendir.c @@ -55,8 +55,8 @@ #include #include #include -#include "../../emu.h" -#include "../../plat.h" +#include "../emu.h" +#include "../plat.h" #include "plat_dir.h" From c07d0fa988e9f21e366a7796e602d3278af37357 Mon Sep 17 00:00:00 2001 From: darkstar Date: Tue, 8 May 2018 01:01:13 +0200 Subject: [PATCH 2/2] MSVC: Update project files --- src/win/msvc/vc15/VARCem.vcxproj | 811 +++---- src/win/msvc/vc15/VARCem.vcxproj.filters | 2483 +++++++++++----------- 2 files changed, 1688 insertions(+), 1606 deletions(-) diff --git a/src/win/msvc/vc15/VARCem.vcxproj b/src/win/msvc/vc15/VARCem.vcxproj index 321b6b8..33d7221 100644 --- a/src/win/msvc/vc15/VARCem.vcxproj +++ b/src/win/msvc/vc15/VARCem.vcxproj @@ -20,10 +20,10 @@ - - - - + + + + @@ -43,256 +43,258 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -317,10 +319,10 @@ - - - - + + + + @@ -390,174 +392,175 @@ - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/src/win/msvc/vc15/VARCem.vcxproj.filters b/src/win/msvc/vc15/VARCem.vcxproj.filters index 5c2b492..999e423 100644 --- a/src/win/msvc/vc15/VARCem.vcxproj.filters +++ b/src/win/msvc/vc15/VARCem.vcxproj.filters @@ -4,42 +4,13 @@ - - - - - - - - - - - - - - - - - - - cdrom - - - cdrom - - - cdrom - - - cdrom - cpu @@ -91,561 +62,6 @@ cpu - - disk - - - disk - - - disk - - - disk - - - disk - - - disk - - - disk - - - disk - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - machine - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network - - - network - - - network - - - network - - - scsi - - - scsi - - - scsi - - - scsi - - - scsi - - - scsi - - - scsi - - - scsi - - - scsi - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\munt\sha1 - - - sound\munt\c_interface - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - win @@ -709,116 +125,7 @@ win - - video - - - machine - - - machine - - - machine - - - machine - - - sio - - - sio - - - sio - - - sio - - - sio - - - sio - - - sio - - - floppy\lzf - - - floppy\lzf - - - - disk - - - disk - - - disk - - - disk - - - machine - - - input\game - - - input\game - - - input\game - - - input\game - - - input\game - - - input - - - input - - - input - - - input - - - input - - - input - - - input - - - ports - - - ports - - - ports - - - ports - - - ports - ui @@ -828,45 +135,754 @@ ui + + devices\cdrom + + + devices\cdrom + + + devices\cdrom + + + devices\cdrom + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\floppy\lzf + + + devices\floppy\lzf + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\input\game + + + devices\input\game + + + devices\input\game + + + devices\input\game + + + devices\input\game + + + devices\input + + + devices\input + + + devices\input + + + devices\input + + + devices\input + + + devices\input + + + devices\input + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network + + + devices\network + + + devices\network + + + devices\network + + + devices\ports + + + devices\ports + + + devices\ports + + + devices\ports + + + devices\ports + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\sio + + + devices\sio + + + devices\sio + + + devices\sio + + + devices\sio + + + devices\sio + + + devices\sio + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\munt\c_interface + + + devices\sound\munt\sha1 + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + machines + + + devices\video + - - - - - - - - - - - - - - - - cdrom - - - cdrom - - - cdrom - - - cdrom - cpu @@ -1068,390 +1084,6 @@ cpu - - disk - - - disk - - - disk - - - disk - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - machine - - - machine - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network\slirp - - - network - - - network - - - network - - - scsi - - - scsi - - - scsi - - - scsi - - - scsi - - - scsi - - - scsi - - - scsi - - - scsi - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\resid-fp - - - sound\munt\sha1 - - - sound\munt\c_interface - - - sound\munt\c_interface - - - sound\munt\c_interface - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound\munt - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - sound - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - - - video - win @@ -1467,123 +1099,570 @@ win - - machine - - - machine - - - sio - - - floppy\lzf - - - floppy\lzf - - - floppy\lzf - - - floppy\lzf - - - input\game - - - input - - - input - - - ports - - - ports - - - ports - - - ports - - - ports - ui ui + + devices\cdrom + + + devices\cdrom + + + devices\cdrom + + + devices\cdrom + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\disk + + + devices\floppy\lzf + + + devices\floppy\lzf + + + devices\floppy\lzf + + + devices\floppy\lzf + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\floppy + + + devices\input\game + + + devices\input + + + devices\input + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network\slirp + + + devices\network + + + devices\network + + + devices\network + + + devices\ports + + + devices\ports + + + devices\ports + + + devices\ports + + + devices\ports + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\scsi + + + devices\sio + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\resid-fp + + + devices\sound\munt\c_interface + + + devices\sound\munt\c_interface + + + devices\sound\munt\c_interface + + + devices\sound\munt\sha1 + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\sound\munt + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\system + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + devices\video + + + machines + + + machines + + + machines + + + machines + - - {33d139d2-8501-4ec5-adf5-30695fd66b58} - {7a5514af-a83b-483a-bfac-af1e20215c22} - - {0eb40b0a-0704-4966-b094-dc23e7fb1224} - - - {a9a86e4f-b4eb-4687-a979-f97b394db706} - - - {a99de26d-e4fd-4223-952c-21f1657a20e7} - - - {7cae45b9-af45-4f82-9c53-a4e3094ddee4} - - - {c0afa9df-08d3-40a6-a4d4-88fb97816009} - - - {515f18e5-5eab-42f6-8364-37f02bc4f964} - - - {2617b8d7-3afc-4f23-a0c8-936dab6c38b6} - - - {b28a24be-02cf-4896-9c96-aee25851df13} - - - {74dd2459-6b2f-4123-bddd-37f561ea710d} - - - {b8b30a24-da56-40f2-9a15-9c90ec2a98ed} - - - {144b7265-aa9e-453b-9855-78cd74ef9b76} - - - {99b35c64-342c-4f15-89b0-47c15f8db344} - {cb655d08-c712-4197-9eb8-2f5b7f49eed1} - - {4fc4a59c-bb7c-45d7-a467-a06198e71472} - - - {98d7b877-02b8-4c6b-b2b6-d2cc49f357bc} - - - {923338ef-338a-4592-9839-9f8587d93c52} - - - {fc7fc92b-b4da-4f3c-a5c7-4d2548b60fb2} - - - {b9d0388f-b14d-4448-85fe-7179fff3f77f} - {7cec753e-1e2c-4ebd-ba5b-e728767c949f} + + {e97ddf22-9ad1-46da-bc17-bd998507adf8} + + + {33d139d2-8501-4ec5-adf5-30695fd66b58} + + + {0eb40b0a-0704-4966-b094-dc23e7fb1224} + + + {a9a86e4f-b4eb-4687-a979-f97b394db706} + + + {98d7b877-02b8-4c6b-b2b6-d2cc49f357bc} + + + {923338ef-338a-4592-9839-9f8587d93c52} + + + {fc7fc92b-b4da-4f3c-a5c7-4d2548b60fb2} + + + {7cae45b9-af45-4f82-9c53-a4e3094ddee4} + + + {c0afa9df-08d3-40a6-a4d4-88fb97816009} + + + {b9d0388f-b14d-4448-85fe-7179fff3f77f} + + + {515f18e5-5eab-42f6-8364-37f02bc4f964} + + + {4fc4a59c-bb7c-45d7-a467-a06198e71472} + + + {2617b8d7-3afc-4f23-a0c8-936dab6c38b6} + + + {b28a24be-02cf-4896-9c96-aee25851df13} + + + {b8b30a24-da56-40f2-9a15-9c90ec2a98ed} + + + {144b7265-aa9e-453b-9855-78cd74ef9b76} + + + {309c083e-3028-4e46-a758-a8afeb95e914} + + + {4b343ed5-4818-4b62-beac-fcbc4185383f} + + + {99b35c64-342c-4f15-89b0-47c15f8db344} + + + {c21f8b49-308c-4e25-b69d-b03c1e24617a} +