From 4e590da072542c9ce5ced7faf3fb855e9016d245 Mon Sep 17 00:00:00 2001 From: skeetor Date: Sat, 21 Sep 2019 19:22:44 +0200 Subject: [PATCH] Fixed PlatformToolset settings Move build instructions to main directory to display it in github Added nasm files to project structure. Fixed SDK versions and build failures in different build configurations --- .gitignore | 1 + od-win32/compilehelp.txt => README.md | 12 +- od-win32/asm.cmd | 9 - od-win32/build68k_msvc/build68k_msvc.vcxproj | 4 +- .../genblitter_msvc/genblitter_msvc.vcxproj | 9 +- od-win32/gencomp_msvc/gencomp_msvc.vcxproj | 4 +- od-win32/gencpu_msvc/gencpu_msvc.vcxproj | 4 +- .../genlinetoscr_msvc.vcxproj | 6 +- od-win32/prowizard/prowizard.vcxproj | 6 +- od-win32/unpackers/unpackers.vcxproj | 4 +- od-win32/winuae_msvc15/winuae_msvc.vcxproj | 267 +++++++++++++----- .../winuae_msvc15/winuae_msvc.vcxproj.filters | 35 ++- 12 files changed, 252 insertions(+), 109 deletions(-) rename od-win32/compilehelp.txt => README.md (80%) delete mode 100644 od-win32/asm.cmd diff --git a/.gitignore b/.gitignore index c4210916..af888507 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ packages.config *.db-shm *.db-wal *.o +**/.vs diff --git a/od-win32/compilehelp.txt b/README.md similarity index 80% rename from od-win32/compilehelp.txt rename to README.md index 9568e7b6..2c0ba882 100644 --- a/od-win32/compilehelp.txt +++ b/README.md @@ -1,4 +1,6 @@ +# WinUAE + 1) Requirements: Windows 7 32-bit/64-bit or newer. 2) Visual Studio 2017 Community with the following feature: @@ -24,13 +26,13 @@ Download Link -> http://www.winuae.net/files/b/aros.rom.cpp.zip -7) Download and Install Nasm (Assembler Compiler) +7) Download and Install Nasm (Assembler Compiler) and put it in PATH https://www.nasm.us/ - -8) Into Visual Studio click on "File"->"Open"->"Project/Solution" select the folder \od-win32\winuae_msvc15\winuae_msvc.sln (Ignore error message "Unsupported" and click ok) -9) In The solution 'winuae_msvc' you can unload or delete the following project: +8) In Visual Studio click on "File"->"Open"->"Project/Solution" select the folder \od-win32\winuae_msvc15\winuae_msvc.sln (Ignore error message "Unsupported" and click ok) + +9) In The solution 'winuae_msvc' you can unload or delete the following projects (and all others not needed in step 12): -uaeunp -consolewrapper -decompess @@ -55,4 +57,4 @@ 13) Switch to Test (debug build) or FullRelease (full optimized) and select either 32-bit or 64-bit. Compile. -Finished. In the "D:\Amiga\" you find winuae.exe and winuae64.exe +Finished. In "D:\Amiga\" you find winuae.exe and winuae64.exe diff --git a/od-win32/asm.cmd b/od-win32/asm.cmd deleted file mode 100644 index 8697e0c0..00000000 --- a/od-win32/asm.cmd +++ /dev/null @@ -1,9 +0,0 @@ -nasm -f win32 fpux86_80.asm -nasm -f win64 fpux64_80.asm - -nasm -w-orphan-labels -f win32 hq2x32.asm -nasm -w-orphan-labels -f win32 hq3x32.asm -nasm -w-orphan-labels -f win32 hq4x32.asm -nasm -w-orphan-labels -f win32 hq2x16.asm -nasm -w-orphan-labels -f win32 hq3x16.asm -nasm -w-orphan-labels -f win32 hq4x16.asm diff --git a/od-win32/build68k_msvc/build68k_msvc.vcxproj b/od-win32/build68k_msvc/build68k_msvc.vcxproj index f096649e..30920d4a 100644 --- a/od-win32/build68k_msvc/build68k_msvc.vcxproj +++ b/od-win32/build68k_msvc/build68k_msvc.vcxproj @@ -25,7 +25,7 @@ build68k {AF3DBBDE-E006-4DC3-9A26-CB0D7D82AE3C} - 10.0 + 10.0.18362.0 @@ -60,7 +60,7 @@ Application false Unicode - v142 + v141_xp false diff --git a/od-win32/genblitter_msvc/genblitter_msvc.vcxproj b/od-win32/genblitter_msvc/genblitter_msvc.vcxproj index 635a923a..b118399f 100644 --- a/od-win32/genblitter_msvc/genblitter_msvc.vcxproj +++ b/od-win32/genblitter_msvc/genblitter_msvc.vcxproj @@ -25,7 +25,7 @@ genblitter {765B0AF0-B8D3-4998-89AF-D6F939E1CD18} - 10.0 + 10.0.18362.0 @@ -53,7 +53,7 @@ Application false Unicode - v142 + v141_xp false @@ -304,6 +304,11 @@ genblitter.exe t >..\..\blittable.c + + + ..\..\include;..\..;..\;%(AdditionalIncludeDirectories) + + diff --git a/od-win32/gencomp_msvc/gencomp_msvc.vcxproj b/od-win32/gencomp_msvc/gencomp_msvc.vcxproj index 18890bea..39ef41e9 100644 --- a/od-win32/gencomp_msvc/gencomp_msvc.vcxproj +++ b/od-win32/gencomp_msvc/gencomp_msvc.vcxproj @@ -21,7 +21,7 @@ gencomp {54197DFF-9CAA-4A9F-B9C2-2881EA04EACB} - 10.0 + 10.0.18362.0 @@ -44,7 +44,7 @@ false false Unicode - v142 + v141_xp false diff --git a/od-win32/gencpu_msvc/gencpu_msvc.vcxproj b/od-win32/gencpu_msvc/gencpu_msvc.vcxproj index b8239277..695aed45 100644 --- a/od-win32/gencpu_msvc/gencpu_msvc.vcxproj +++ b/od-win32/gencpu_msvc/gencpu_msvc.vcxproj @@ -21,7 +21,7 @@ gencpu {DEF7ACF7-050E-4069-BB99-5B5D93F60521} - 10.0 + 10.0.18362.0 @@ -42,7 +42,7 @@ Application false Unicode - v142 + v141_xp false diff --git a/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj b/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj index fec977ff..e39add80 100644 --- a/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj +++ b/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj @@ -23,7 +23,7 @@ {E9F73E11-A463-45C6-A733-2BED75852BA1} genlinetoscr_msvc Win32Proj - 10.0 + 10.0.18362.0 @@ -44,7 +44,7 @@ Application Unicode true - v142 + v141_xp false @@ -171,6 +171,7 @@ del genlinetoscr.exe Level3 ProgramDatabase + ..\..\include;..\..;..\ deleteing linetoscr.cpp @@ -207,6 +208,7 @@ del genlinetoscr.exe Level3 ProgramDatabase + ..\..\include;..\..;..\ deleteing linetoscr.c diff --git a/od-win32/prowizard/prowizard.vcxproj b/od-win32/prowizard/prowizard.vcxproj index 40727fec..253f49cf 100644 --- a/od-win32/prowizard/prowizard.vcxproj +++ b/od-win32/prowizard/prowizard.vcxproj @@ -30,8 +30,7 @@ {8627DA33-98D1-4F60-B404-ECCEE0EE7BF9} prowizard Win32Proj - 8.1 - 10.0 + 10.0.18362.0 @@ -65,7 +64,7 @@ StaticLibrary Unicode true - v142 + v141_xp StaticLibrary @@ -96,7 +95,6 @@ - <_ProjectFileVersion>10.0.30128.1 $(SolutionDir)$(Configuration)\..\..\lib\ $(SolutionDir)$(Configuration)\..\..\lib\ $(SolutionDir)$(Configuration)\..\..\lib\ diff --git a/od-win32/unpackers/unpackers.vcxproj b/od-win32/unpackers/unpackers.vcxproj index 979f2582..725d2fa7 100644 --- a/od-win32/unpackers/unpackers.vcxproj +++ b/od-win32/unpackers/unpackers.vcxproj @@ -30,7 +30,7 @@ {98BA115B-829F-4085-9729-ABD0D779A60A} Win32Proj unpackers - 10.0 + 10.0.18362.0 @@ -66,7 +66,7 @@ false true Unicode - v142 + v141_xp StaticLibrary diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj b/od-win32/winuae_msvc15/winuae_msvc.vcxproj index 15fab235..3ba92722 100644 --- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj +++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj @@ -38,8 +38,7 @@ winuae {4ADAA943-1AC8-4FB5-82E5-4FB753B6C2DA} winuae - 8.1 - 10.0 + 10.0.18362.0 @@ -61,7 +60,7 @@ Application false Unicode - v141_xp + v142 false @@ -1130,6 +1129,202 @@ + + false + Document + false + false + false + nasm -f win64 %(FullPath) -o $(IntDir)%(filename).obj + nasm -f win64 %(FullPath) -o $(IntDir)%(filename).obj + nasm -f win64 %(FullPath) -o $(IntDir)%(filename).obj + nasm -f win64 %(FullPath) -o $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + Assembling %(filename) + Assembling %(filename) + Assembling %(filename) + Assembling %(filename) + nasm -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -f win32 %(FullPath) -o $(IntDir)%(filename).obj + Assembling %(filename) + Assembling %(filename) + Assembling %(filename) + Assembling %(filename) + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + true + true + true + true + + + false + false + false + false + Document + nasm -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -f win32 %(FullPath) -o $(IntDir)%(filename).obj + Assembling %(filename) + Assembling %(filename) + Assembling %(filename) + Assembling %(filename) + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + true + true + true + true + + + false + false + false + false + true + true + true + true + Document + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + Assembling %(filename) + Assembling %(filename) + Assembling %(filename) + Assembling %(filename) + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + + + false + Document + false + false + false + true + true + true + true + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + Assembling %(filename) + Assembling %(filename) + Assembling %(filename) + Assembling %(filename) + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + + + false + Document + false + false + false + true + true + true + true + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + Assembling %(filename) + Assembling %(filename) + Assembling %(filename) + Assembling %(filename) + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + + + false + Document + false + false + false + true + true + true + true + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + Assembling %(filename) + Assembling %(filename) + Assembling %(filename) + Assembling %(filename) + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + + + false + Document + false + false + false + true + true + true + true + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + Assembling %(filename) + Assembling %(filename) + Assembling %(filename) + Assembling %(filename) + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + + + false + false + false + false + Document + true + true + true + true + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + nasm -w-orphan-labels -f win32 %(FullPath) -o $(IntDir)%(filename).obj + Assembling %(filename) + Assembling %(filename) + Assembling %(filename) + Assembling %(filename) + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + $(IntDir)%(filename).obj + @@ -1166,50 +1361,6 @@ - - - true - true - true - true - Document - - - true - true - true - true - Document - - - true - true - true - true - Document - - - true - true - true - true - Document - - - true - true - true - true - Document - - - true - true - true - true - Document - - @@ -1513,28 +1664,6 @@ 4.0_level_9_1 - - - true - true - true - true - false - false - false - false - - - true - true - true - true - false - false - false - false - - diff --git a/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters b/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters index c5c520e2..999fe6a0 100644 --- a/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters +++ b/od-win32/winuae_msvc15/winuae_msvc.vcxproj.filters @@ -74,6 +74,9 @@ {aacd260d-3fd9-43a0-9cac-463ddd009704} + + {9d6d0e7b-76b0-4b28-a9ef-0b69a02528c7} + @@ -1025,20 +1028,31 @@ + + nasm + + + nasm + + + nasm + + + nasm + + + nasm + + + nasm + + win32\Resource Files - - - - - - - - @@ -1060,7 +1074,8 @@ - - + + nasm + \ No newline at end of file -- 2.47.3