diff --git a/src/sound/snd_audiopci.c b/src/sound/snd_audiopci.c index 7305afa..f608f73 100644 --- a/src/sound/snd_audiopci.c +++ b/src/sound/snd_audiopci.c @@ -8,7 +8,7 @@ * * Implementation of the AudioPCI sound device. * - * Version: @(#)snd_audiopci.c 1.0.6 2018/03/25 + * Version: @(#)snd_audiopci.c 1.0.7 2018/03/26 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -41,9 +41,6 @@ #include #include #include -#ifdef _WIN32 -# define _USE_MATH_DEFINES -#endif #include #define HAVE_STDARG_H #include "../emu.h" diff --git a/src/sound/snd_emu8k.c b/src/sound/snd_emu8k.c index 4dd5099..47604e0 100644 --- a/src/sound/snd_emu8k.c +++ b/src/sound/snd_emu8k.c @@ -8,7 +8,7 @@ * * Implementation of Emu8000 emulator. * - * Version: @(#)snd_emu8k.c 1.0.4 2018/03/25 + * Version: @(#)snd_emu8k.c 1.0.5 2018/03/26 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -43,9 +43,6 @@ #include #include #include -#ifdef _WIN32 -# define _USE_MATH_DEFINES -#endif #include #define HAVE_STDARG_H #include "../emu.h" diff --git a/src/sound/snd_sb_dsp.c b/src/sound/snd_sb_dsp.c index 921b3fb..f32c221 100644 --- a/src/sound/snd_sb_dsp.c +++ b/src/sound/snd_sb_dsp.c @@ -14,7 +14,7 @@ * 486-50 - 32kHz * Pentium - 45kHz * - * Version: @(#)snd_sb_dsp.c 1.0.2 2018/03/25 + * Version: @(#)snd_sb_dsp.c 1.0.3 2018/03/26 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -46,9 +46,6 @@ #include #include #include -#ifdef _WIN32 -# define _USE_MATH_DEFINES -#endif #include #include #include "../emu.h" diff --git a/src/win/Makefile.mingw b/src/win/mingw/Makefile.MinGW similarity index 100% rename from src/win/Makefile.mingw rename to src/win/mingw/Makefile.MinGW diff --git a/src/win/msvc14/Include/d3dx9tex.h b/src/win/msvc/Include/d3dx9tex.h similarity index 100% rename from src/win/msvc14/Include/d3dx9tex.h rename to src/win/msvc/Include/d3dx9tex.h diff --git a/src/win/msvc14/Lib/x64/d3dx9.lib b/src/win/msvc/Lib/x64/d3dx9.lib similarity index 100% rename from src/win/msvc14/Lib/x64/d3dx9.lib rename to src/win/msvc/Lib/x64/d3dx9.lib diff --git a/src/win/msvc14/Lib/x86/d3dx9.lib b/src/win/msvc/Lib/x86/d3dx9.lib similarity index 100% rename from src/win/msvc14/Lib/x86/d3dx9.lib rename to src/win/msvc/Lib/x86/d3dx9.lib diff --git a/src/win/Makefile.VS b/src/win/msvc/Makefile.VC similarity index 96% rename from src/win/Makefile.VS rename to src/win/msvc/Makefile.VC index 102e514..adab5cf 100644 --- a/src/win/Makefile.VS +++ b/src/win/msvc/Makefile.VC @@ -6,9 +6,9 @@ # # This file is part of the VARCem Project. # -# Makefile for Windows systems using Visual Studio 2015. +# Makefile for Windows using Visual Studio 2015. # -# Version: @(#)Makefile.VS 1.0.1 2018/03/25 +# Version: @(#)Makefile.VC 1.0.2 2018/03/26 # # Author: Fred N. van Kempen, # @@ -227,18 +227,23 @@ PREPROC := cl -nologo -EP LINK := link -nologo WINDRES := rc -nologo -r -SYSINC := -Iwin/mingw/include -Iwin/msvc14/include +SYSINC := -Iwin/msvc/Include -Iwin/mingw/include SYSLIB := DEPS = -MMD -MF $*.d -c $< -DEPFILE := win\.depends-msvc14 +DEPFILE := win\.depends-msvc # Set up the correct toolchain flags. -OPTS := $(EXTRAS) $(STUFF) $(VCOPTS) $(WPCAPINC) $(SYSINC) -COPTS := -W1 #-W4 +OPTS := $(EXTRAS) $(STUFF) $(VCOPTS) \ + -D_USE_MATH_DEFINES \ + -D_CRT_NONSTDC_NO_DEPRECATE \ + -D_WINSOCK_DEPRECATED_NO_WARNINGS \ + -D_CRT_SECURE_NO_WARNINGS \ + $(WPCAPINC) $(SYSINC) +COPTS := -W3 CXXOPTS := -EHsc DOPTS := -LOPTS := -LIBPATH:win\msvc14\Lib\$(ARCH) +LOPTS := -LIBPATH:win\msvc\Lib\$(ARCH) ifdef BUILD OPTS += -DBUILD=$(BUILD) endif @@ -300,7 +305,7 @@ endif LIBS := ddraw.lib dinput8.lib dxguid.lib d3d9.lib d3dx9.lib \ comctl32.lib winmm.lib comdlg32.lib advapi32.lib \ gdi32.lib shell32.lib user32.lib kernel32.lib \ - wsock32.lib iphlpapi.lib + wsock32.lib iphlpapi.lib psapi.lib # Optional modules. @@ -626,7 +631,7 @@ VARCem.res: win/VARCem.rc win/VARCem.mpp $(PROG).exe: $(OBJ) VARCem.res @echo Linking $(PROG).exe .. - $(LINK) $(LDFLAGS) -OUT:$(PROG).exe \ + @$(LINK) $(LDFLAGS) -OUT:$(PROG).exe \ $(OBJ) VARCem.res $(LIBS) pcap_if.res: pcap_if.rc diff --git a/src/win/msvc14/VARCem.sln b/src/win/msvc/vc14/VARCem.sln similarity index 100% rename from src/win/msvc14/VARCem.sln rename to src/win/msvc/vc14/VARCem.sln diff --git a/src/win/msvc/vc14/VARCem.vcxproj b/src/win/msvc/vc14/VARCem.vcxproj new file mode 100644 index 0000000..c151fd4 --- /dev/null +++ b/src/win/msvc/vc14/VARCem.vcxproj @@ -0,0 +1,767 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 15.0 + {6E445F28-CA8F-430F-8CCF-C59C53516AC5} + Win32Proj + VARCem + 10.0.10586.0 + + + + Application + true + v140 + NotSet + + + Application + false + v140 + true + NotSet + + + Application + true + v140 + NotSet + + + Application + false + v140 + true + NotSet + + + + + + + + + + + + + + + + + + + + + + + + + true + $(ProjectDir)\..\Include;$(ProjectDir)\..\..\mingw\include;$(ProjectDir)\..\..\mingw\include\pcap;$(IncludePath) + $(ProjectDir)\..\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 + + + true + false + $(ProjectDir)\..\Include;$(ProjectDir)\..\..\mingw\include;$(ProjectDir)\..\..\mingw\include\pcap;$(IncludePath) + $(ProjectDir)\..\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64 + + + false + $(ProjectDir)\..\Include;$(ProjectDir)\..\..\mingw\include;$(ProjectDir)\..\..\mingw\include\pcap;$(IncludePath) + $(ProjectDir)\..\Lib\x86;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);$(NETFXKitsDir)Lib\um\x86 + + + false + false + $(ProjectDir)\..\Include;$(ProjectDir)\..\..\mingw\include;$(ProjectDir)\..\..\mingw\include\pcap;$(IncludePath) + $(ProjectDir)\..\Lib\x64;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);$(NETFXKitsDir)Lib\um\x64 + + + + NotUsing + Level3 + Disabled + true + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + Windows + Debug + winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;%(AdditionalDependencies) + + + $(ProjectDir)\..\..\..\..\src;%(AdditionalIncludeDirectories) + SKIP_MANIFEST + + + + + NotUsing + Level3 + Disabled + true + _DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + Windows + Debug + winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;%(AdditionalDependencies) + + + $(ProjectDir)\..\..\..\..\src;%(AdditionalIncludeDirectories) + + + + + NotUsing + Level3 + MaxSpeed + true + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + Windows + true + true + Debug + winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;%(AdditionalDependencies) + + + $(ProjectDir)\..\..\..\..\src;%(AdditionalIncludeDirectories) + SKIP_MANIFEST + + + + + NotUsing + Level3 + MaxSpeed + true + true + true + NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + Windows + true + true + Debug + winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;%(AdditionalDependencies) + + + $(ProjectDir)\..\..\..\..\src;%(AdditionalIncludeDirectories) + + + + + + diff --git a/src/win/msvc/vc14/VARCem.vcxproj.filters b/src/win/msvc/vc14/VARCem.vcxproj.filters new file mode 100644 index 0000000..fc9bfdc --- /dev/null +++ b/src/win/msvc/vc14/VARCem.vcxproj.filters @@ -0,0 +1,1666 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + cdrom + + + cdrom + + + cdrom + + + cdrom + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + crcspeed + + + crcspeed + + + disk + + + disk + + + disk + + + disk + + + disk + + + disk + + + disk + + + disk + + + disk + + + disk + + + disk + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + game + + + game + + + game + + + game + + + game + + + 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 + + + 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 + + + video + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + video + + + machine + + + machine + + + machine + + + machine + + + + sio + + + sio + + + sio + + + sio + + + sio + + + sio + + + sio + + + floppy\lzf + + + floppy\lzf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + cdrom + + + cdrom + + + cdrom + + + cdrom + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + crcspeed + + + crcspeed + + + disk + + + disk + + + disk + + + disk + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + game + + + game + + + game + + + game + + + game + + + lang + + + 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\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 + + + 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 + + + video + + + video + + + video + + + win + + + win + + + win + + + win + + + win + + + video + + + machine + + + machine + + + sio + + + + floppy\lzf + + + floppy\lzf + + + floppy\lzf + + + floppy\lzf + + + + + {33d139d2-8501-4ec5-adf5-30695fd66b58} + + + {7a5514af-a83b-483a-bfac-af1e20215c22} + + + {1e841add-1ce9-42dd-aaf8-c0ed686448a4} + + + {0eb40b0a-0704-4966-b094-dc23e7fb1224} + + + {a9a86e4f-b4eb-4687-a979-f97b394db706} + + + {542ab504-19c9-43b6-91b6-b3a205ffeb97} + + + {232b8441-5106-47b6-939d-ebd46589c0b2} + + + {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} + + + + + win + + + diff --git a/src/win/msvc14/VARCem.vcxproj.user b/src/win/msvc/vc14/VARCem.vcxproj.user similarity index 100% rename from src/win/msvc14/VARCem.vcxproj.user rename to src/win/msvc/vc14/VARCem.vcxproj.user diff --git a/src/win/msvc15/global.props b/src/win/msvc/vc14/global.props similarity index 80% rename from src/win/msvc15/global.props rename to src/win/msvc/vc14/global.props index 555d8a7..1384760 100644 --- a/src/win/msvc15/global.props +++ b/src/win/msvc/vc14/global.props @@ -3,7 +3,7 @@ - $(ProjectDir)\..\mingw\include;$(ProjectDir)\..\mingw\include\pcap;$(IncludePath) + $(ProjectDir)\..\..\mingw\include;$(ProjectDir)\..\..\mingw\include\pcap;$(IncludePath) @@ -11,4 +11,4 @@ - \ No newline at end of file + diff --git a/src/win/msvc15/VARCem.sln b/src/win/msvc/vc15/VARCem.sln similarity index 100% rename from src/win/msvc15/VARCem.sln rename to src/win/msvc/vc15/VARCem.sln diff --git a/src/win/msvc/vc15/VARCem.vcxproj b/src/win/msvc/vc15/VARCem.vcxproj new file mode 100644 index 0000000..22c26df --- /dev/null +++ b/src/win/msvc/vc15/VARCem.vcxproj @@ -0,0 +1,759 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 15.0 + {6E445F28-CA8F-430F-8CCF-C59C53516AC5} + Win32Proj + VARCem + 10.0.16299.0 + + + + Application + true + v141 + NotSet + + + Application + false + v141 + true + NotSet + + + Application + true + v141 + NotSet + + + Application + false + v141 + true + NotSet + + + + + + + + + + + + + + + + + + + + + + + + + true + + + true + false + + + false + + + false + false + + + + NotUsing + Level3 + Disabled + true + WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + Windows + DebugFull + winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;%(AdditionalDependencies) + + + $(ProjectDir)\..\..\..\..\src;%(AdditionalIncludeDirectories) + SKIP_MANIFEST + + + + + NotUsing + Level3 + Disabled + true + _DEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + Windows + DebugFull + winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;%(AdditionalDependencies) + + + $(ProjectDir)\..\..\..\..\src;%(AdditionalIncludeDirectories) + + + + + NotUsing + Level3 + MaxSpeed + true + true + true + WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + Windows + true + true + DebugFull + winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;%(AdditionalDependencies) + + + $(ProjectDir)\..\..\..\..\src;%(AdditionalIncludeDirectories) + SKIP_MANIFEST + + + + + NotUsing + Level3 + MaxSpeed + true + true + true + NDEBUG;_WINDOWS;%(PreprocessorDefinitions) + true + + + Windows + true + true + DebugFull + winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;%(AdditionalDependencies) + + + $(ProjectDir)\..\..\..\..\src;%(AdditionalIncludeDirectories) + + + + + + diff --git a/src/win/msvc/vc15/VARCem.vcxproj.filters b/src/win/msvc/vc15/VARCem.vcxproj.filters new file mode 100644 index 0000000..bd2865a --- /dev/null +++ b/src/win/msvc/vc15/VARCem.vcxproj.filters @@ -0,0 +1,1666 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + cdrom + + + cdrom + + + cdrom + + + cdrom + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + crcspeed + + + crcspeed + + + disk + + + disk + + + disk + + + disk + + + disk + + + disk + + + disk + + + disk + + + disk + + + disk + + + disk + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + game + + + game + + + game + + + game + + + game + + + 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 + + + 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 + + + video + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + win + + + video + + + machine + + + machine + + + machine + + + machine + + + + sio + + + sio + + + sio + + + sio + + + sio + + + sio + + + sio + + + floppy\lzf + + + floppy\lzf + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + cdrom + + + cdrom + + + cdrom + + + cdrom + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + cpu + + + crcspeed + + + crcspeed + + + disk + + + disk + + + disk + + + disk + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + floppy + + + game + + + game + + + game + + + game + + + game + + + lang + + + 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\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 + + + 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 + + + video + + + video + + + video + + + win + + + win + + + win + + + win + + + win + + + video + + + machine + + + machine + + + sio + + + + floppy\lzf + + + floppy\lzf + + + floppy\lzf + + + floppy\lzf + + + + + {33d139d2-8501-4ec5-adf5-30695fd66b58} + + + {7a5514af-a83b-483a-bfac-af1e20215c22} + + + {1e841add-1ce9-42dd-aaf8-c0ed686448a4} + + + {0eb40b0a-0704-4966-b094-dc23e7fb1224} + + + {a9a86e4f-b4eb-4687-a979-f97b394db706} + + + {542ab504-19c9-43b6-91b6-b3a205ffeb97} + + + {232b8441-5106-47b6-939d-ebd46589c0b2} + + + {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} + + + + + win + + + diff --git a/src/win/msvc15/VARCem.vcxproj.user b/src/win/msvc/vc15/VARCem.vcxproj.user similarity index 100% rename from src/win/msvc15/VARCem.vcxproj.user rename to src/win/msvc/vc15/VARCem.vcxproj.user diff --git a/src/win/msvc14/global.props b/src/win/msvc/vc15/global.props similarity index 80% rename from src/win/msvc14/global.props rename to src/win/msvc/vc15/global.props index 555d8a7..1384760 100644 --- a/src/win/msvc14/global.props +++ b/src/win/msvc/vc15/global.props @@ -3,7 +3,7 @@ - $(ProjectDir)\..\mingw\include;$(ProjectDir)\..\mingw\include\pcap;$(IncludePath) + $(ProjectDir)\..\..\mingw\include;$(ProjectDir)\..\..\mingw\include\pcap;$(IncludePath) @@ -11,4 +11,4 @@ - \ No newline at end of file + diff --git a/src/win/msvc14/VARCem.vcxproj b/src/win/msvc14/VARCem.vcxproj deleted file mode 100644 index 6f02c2b..0000000 --- a/src/win/msvc14/VARCem.vcxproj +++ /dev/null @@ -1,760 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 15.0 - {6E445F28-CA8F-430F-8CCF-C59C53516AC5} - Win32Proj - VARCem - 10.0.10586.0 - - - - Application - true - v140 - NotSet - - - Application - false - v141 - true - NotSet - - - Application - true - v141 - NotSet - - - Application - false - v141 - true - NotSet - - - - - - - - - - - - - - - - - - - - - - - - - true - $(ProjectDir)\include;$(ProjectDir)\..\mingw\include;$(ProjectDir)\..\mingw\include\pcap;$(IncludePath) - - - true - false - - - false - - - false - false - - - - NotUsing - Level3 - Disabled - true - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - - - Windows - DebugFull - winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;%(AdditionalDependencies) - - - $(ProjectDir)\..\..\..\src;%(AdditionalIncludeDirectories) - SKIP_MANIFEST - - - - - NotUsing - Level3 - Disabled - true - _DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - - - Windows - DebugFull - winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;%(AdditionalDependencies) - - - $(ProjectDir)\..\..\..\src;%(AdditionalIncludeDirectories) - - - - - NotUsing - Level3 - MaxSpeed - true - true - true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - - - Windows - true - true - DebugFull - winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;%(AdditionalDependencies) - - - $(ProjectDir)\..\..\..\src;%(AdditionalIncludeDirectories) - SKIP_MANIFEST - - - - - NotUsing - Level3 - MaxSpeed - true - true - true - NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - - - Windows - true - true - DebugFull - winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;%(AdditionalDependencies) - - - $(ProjectDir)\..\..\..\src;%(AdditionalIncludeDirectories) - - - - - - \ No newline at end of file diff --git a/src/win/msvc14/VARCem.vcxproj.filters b/src/win/msvc14/VARCem.vcxproj.filters deleted file mode 100644 index 9f4493e..0000000 --- a/src/win/msvc14/VARCem.vcxproj.filters +++ /dev/null @@ -1,1666 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - cdrom - - - cdrom - - - cdrom - - - cdrom - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - crcspeed - - - crcspeed - - - disk - - - disk - - - disk - - - disk - - - disk - - - disk - - - disk - - - disk - - - disk - - - disk - - - disk - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - game - - - game - - - game - - - game - - - game - - - 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 - - - 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 - - - video - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - video - - - machine - - - machine - - - machine - - - machine - - - - sio - - - sio - - - sio - - - sio - - - sio - - - sio - - - sio - - - floppy\lzf - - - floppy\lzf - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - cdrom - - - cdrom - - - cdrom - - - cdrom - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - crcspeed - - - crcspeed - - - disk - - - disk - - - disk - - - disk - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - game - - - game - - - game - - - game - - - game - - - lang - - - 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\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 - - - 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 - - - video - - - video - - - video - - - win - - - win - - - win - - - win - - - win - - - video - - - machine - - - machine - - - sio - - - - floppy\lzf - - - floppy\lzf - - - floppy\lzf - - - floppy\lzf - - - - - {33d139d2-8501-4ec5-adf5-30695fd66b58} - - - {7a5514af-a83b-483a-bfac-af1e20215c22} - - - {1e841add-1ce9-42dd-aaf8-c0ed686448a4} - - - {0eb40b0a-0704-4966-b094-dc23e7fb1224} - - - {a9a86e4f-b4eb-4687-a979-f97b394db706} - - - {542ab504-19c9-43b6-91b6-b3a205ffeb97} - - - {232b8441-5106-47b6-939d-ebd46589c0b2} - - - {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} - - - - - win - - - \ No newline at end of file diff --git a/src/win/msvc15/VARCem.vcxproj b/src/win/msvc15/VARCem.vcxproj deleted file mode 100644 index d117cf9..0000000 --- a/src/win/msvc15/VARCem.vcxproj +++ /dev/null @@ -1,759 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 15.0 - {6E445F28-CA8F-430F-8CCF-C59C53516AC5} - Win32Proj - VARCem - 10.0.16299.0 - - - - Application - true - v141 - NotSet - - - Application - false - v141 - true - NotSet - - - Application - true - v141 - NotSet - - - Application - false - v141 - true - NotSet - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - false - - - false - - - false - false - - - - NotUsing - Level3 - Disabled - true - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - - - Windows - DebugFull - winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;%(AdditionalDependencies) - - - $(ProjectDir)\..\..\..\src;%(AdditionalIncludeDirectories) - SKIP_MANIFEST - - - - - NotUsing - Level3 - Disabled - true - _DEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - - - Windows - DebugFull - winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;%(AdditionalDependencies) - - - $(ProjectDir)\..\..\..\src;%(AdditionalIncludeDirectories) - - - - - NotUsing - Level3 - MaxSpeed - true - true - true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - - - Windows - true - true - DebugFull - winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;%(AdditionalDependencies) - - - $(ProjectDir)\..\..\..\src;%(AdditionalIncludeDirectories) - SKIP_MANIFEST - - - - - NotUsing - Level3 - MaxSpeed - true - true - true - NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - true - - - Windows - true - true - DebugFull - winmm.lib;ws2_32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;psapi.lib;Comctl32.lib;DInput8.lib;d3d9.lib;d3dx9.lib;ddraw.lib;dxguid.lib;%(AdditionalDependencies) - - - $(ProjectDir)\..\..\..\src;%(AdditionalIncludeDirectories) - - - - - - \ No newline at end of file diff --git a/src/win/msvc15/VARCem.vcxproj.filters b/src/win/msvc15/VARCem.vcxproj.filters deleted file mode 100644 index 9f4493e..0000000 --- a/src/win/msvc15/VARCem.vcxproj.filters +++ /dev/null @@ -1,1666 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - cdrom - - - cdrom - - - cdrom - - - cdrom - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - crcspeed - - - crcspeed - - - disk - - - disk - - - disk - - - disk - - - disk - - - disk - - - disk - - - disk - - - disk - - - disk - - - disk - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - game - - - game - - - game - - - game - - - game - - - 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 - - - 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 - - - video - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - win - - - video - - - machine - - - machine - - - machine - - - machine - - - - sio - - - sio - - - sio - - - sio - - - sio - - - sio - - - sio - - - floppy\lzf - - - floppy\lzf - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - cdrom - - - cdrom - - - cdrom - - - cdrom - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - cpu - - - crcspeed - - - crcspeed - - - disk - - - disk - - - disk - - - disk - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - floppy - - - game - - - game - - - game - - - game - - - game - - - lang - - - 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\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 - - - 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 - - - video - - - video - - - video - - - win - - - win - - - win - - - win - - - win - - - video - - - machine - - - machine - - - sio - - - - floppy\lzf - - - floppy\lzf - - - floppy\lzf - - - floppy\lzf - - - - - {33d139d2-8501-4ec5-adf5-30695fd66b58} - - - {7a5514af-a83b-483a-bfac-af1e20215c22} - - - {1e841add-1ce9-42dd-aaf8-c0ed686448a4} - - - {0eb40b0a-0704-4966-b094-dc23e7fb1224} - - - {a9a86e4f-b4eb-4687-a979-f97b394db706} - - - {542ab504-19c9-43b6-91b6-b3a205ffeb97} - - - {232b8441-5106-47b6-939d-ebd46589c0b2} - - - {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} - - - - - win - - - \ No newline at end of file diff --git a/src/win/win_joystick.cpp b/src/win/win_joystick.cpp index 6570140..da927f7 100644 --- a/src/win/win_joystick.cpp +++ b/src/win/win_joystick.cpp @@ -11,7 +11,7 @@ * NOTE: Hacks currently needed to compile with MSVC; DX needs to * be updated to 11 or 12 or so. --FvK * - * Version: @(#)win_joystick.cpp 1.0.6 2018/03/25 + * Version: @(#)win_joystick.cpp 1.0.7 2018/03/26 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -50,9 +50,6 @@ #endif #include #include -#ifdef _WIN32 -# define _USE_MATH_DEFINES -#endif #include #include "../emu.h" #include "../device.h"