From 71b9347e521366b21cfbfc9755d748c0f7e9ee22 Mon Sep 17 00:00:00 2001 From: "Michael J. Manley" Date: Sat, 25 Mar 2023 15:49:30 -0700 Subject: [PATCH] [no ci] Switched from CLion to Visual Studio. Added some configuration projects if someone else wants to do the same, just assumes your using MSYS2 in C:\msys64 --- .gitignore | 468 +++++++++++++++++++--- .idea/.gitignore | 8 - .idea/.name | 1 - .idea/codeStyles/Project.xml | 94 ----- .idea/codeStyles/codeStyleConfig.xml | 5 - .idea/misc.xml | 4 - .idea/modules.xml | 8 - .idea/pcem.iml | 2 - .idea/vcs.xml | 6 - .vs/launch.vs.json | 32 ++ CMakeSettings.json | 76 ++++ cmake/toolchains/i686-w64-mingw32.cmake | 21 + cmake/toolchains/x86_64-w64-mingw32.cmake | 21 + 13 files changed, 556 insertions(+), 190 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/.name delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/codeStyles/codeStyleConfig.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/pcem.iml delete mode 100644 .idea/vcs.xml create mode 100644 .vs/launch.vs.json create mode 100644 CMakeSettings.json create mode 100644 cmake/toolchains/i686-w64-mingw32.cmake create mode 100644 cmake/toolchains/x86_64-w64-mingw32.cmake diff --git a/.gitignore b/.gitignore index bbe1b430..f5cf9fce 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +# Created by https://www.toptal.com/developers/gitignore/api/cmake,visualstudio +# Edit at https://www.toptal.com/developers/gitignore?templates=cmake,visualstudio + +### CMake ### CMakeLists.txt.user CMakeCache.txt CMakeFiles @@ -9,76 +13,416 @@ install_manifest.txt compile_commands.json CTestTestfile.cmake _deps + +### CMake Patch ### +# External projects *-prefix/ + +### VisualStudio ### +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/* +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* *~ -.fuse_hidden* -.directory -.Trash-* -.nfs* -.DS_Store -.AppleDouble -.LSOverride -._* -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk -Thumbs.db -Thumbs.db:encryptable -ehthumbs.db -ehthumbs_vista.db -*.stackdump -[Dd]esktop.ini -$RECYCLE.BIN/ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs *.cab *.msi *.msix *.msm *.msp -*.lnk + +# JetBrains Rider +*.sln.iml + +### VisualStudio Patch ### +# Additional files built by Visual Studio + +# End of https://www.toptal.com/developers/gitignore/api/cmake,visualstudio + build/ build-*/ cmake-build-*/ output/ - -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/**/usage.statistics.xml -.idea/**/dictionaries -.idea/**/shelf -.idea/**/aws.xml -.idea/**/contentModel.xml -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml -.idea/**/dbnavigator.xml -.idea/**/mongoSettings.xml -*.iws -.idea_modules/ -atlassian-ide-plugin.xml -.idea/replstate.xml -.idea/sonarlint/ -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties -.idea/httpRequests -.idea/caches/build_file_checksums.ser -.idea/**/sonarlint/ -.idea/**/sonarIssues.xml -.idea/**/markdown-navigator.xml -.idea/**/markdown-navigator-enh.xml -.idea/**/markdown-navigator/ -.idea/$CACHE_FILE$ -.idea/codestream.xml \ No newline at end of file +!.vs/launch.vs.json \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b81..00000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 1ce8ea4a..00000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -PCem \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 91f6454f..00000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 79ee123c..00000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 79b3c948..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index cb248dd6..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/pcem.iml b/.idea/pcem.iml deleted file mode 100644 index f08604bb..00000000 --- a/.idea/pcem.iml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7f..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.vs/launch.vs.json b/.vs/launch.vs.json new file mode 100644 index 00000000..d13d7516 --- /dev/null +++ b/.vs/launch.vs.json @@ -0,0 +1,32 @@ +{ + "version": "0.2.1", + "defaults": {}, + "configurations": [ + { + "project": "CMakeLists.txt", + "projectTarget": "pcem.exe (src\\pcem.exe)", + "name": "PCem 64-bit Debugger", + "type": "cppdbg", + "miDebuggerPath": "C:\\msys64\\mingw64\\bin\\gdb.exe", + "inheritEnvironments": [ + "mingw_64" + ], + "MIMode": "gdb", + "program": "${debugInfo.target}", + "externalConsole": true + }, + { + "project": "CMakeLists.txt", + "projectTarget": "pcem.exe (src\\pcem.exe)", + "name": "PCem 32-bit Debugger", + "type": "cppdbg", + "miDebuggerPath": "C:\\msys64\\mingw32\\bin\\gdb.exe", + "inheritEnvironments": [ + "mingw_i686" + ], + "MIMode": "gdb", + "program": "${debugInfo.target}", + "externalConsole": true + } + ] +} \ No newline at end of file diff --git a/CMakeSettings.json b/CMakeSettings.json new file mode 100644 index 00000000..c3fc52e3 --- /dev/null +++ b/CMakeSettings.json @@ -0,0 +1,76 @@ +{ + "configurations": [ + { + "environments": [ + { + "PATH": "C:\\msys64\\mingw64\\bin;C:\\msys64\\usr\\bin;${env.PATH}", + "environment": "mingw_64" + } + ], + "name": "MinGW x64 - Debug", + "generator": "Ninja", + "configurationType": "Debug", + "inheritEnvironments": [ "mingw_64" ], + "cmakeCommandArgs": "-DMSYS=1", + "buildCommandArgs": "-v", + "ctestCommandArgs": "", + "intelliSenseMode": "linux-gcc-x64", + "cmakeToolchain": "cmake\\toolchains\\x86_64-w64-mingw32.cmake", + "buildRoot": "${workspaceRoot}\\cmake-build-x64-debug" + }, + { + "environments": [ + { + "PATH": "C:\\msys64\\mingw32\\bin;C:\\msys64\\usr\\bin;${env.PATH}", + "environment": "mingw_i686" + } + ], + "name": "MinGW i686 - Debug", + "generator": "Ninja", + "configurationType": "Debug", + "inheritEnvironments": [ "mingw_i686" ], + "cmakeCommandArgs": "-DMSYS=1", + "buildCommandArgs": "-v", + "ctestCommandArgs": "", + "intelliSenseMode": "linux-gcc-x86", + "cmakeToolchain": "cmake\\toolchains\\i686-w64-mingw32.cmake", + "buildRoot": "${workspaceRoot}\\cmake-build-x86-debug" + }, + { + "environments": [ + { + "PATH": "C:\\msys64\\mingw64\\bin;C:\\msys64\\usr\\bin;${env.PATH}", + "environment": "mingw_64" + } + ], + "name": "MinGW x64 - Release", + "generator": "Ninja", + "configurationType": "Release", + "inheritEnvironments": [ "mingw_64" ], + "cmakeCommandArgs": "-DMSYS=1", + "buildCommandArgs": "-v", + "ctestCommandArgs": "", + "intelliSenseMode": "linux-gcc-x64", + "cmakeToolchain": "cmake\\toolchains\\x86_64-w64-mingw32.cmake", + "buildRoot": "${workspaceRoot}\\cmake-build-x64-release" + }, + { + "environments": [ + { + "PATH": "C:\\msys64\\mingw32\\bin;C:\\msys64\\usr\\bin;${env.PATH}", + "environment": "mingw_i686" + } + ], + "name": "MinGW i686 - Release", + "generator": "Ninja", + "configurationType": "Release", + "inheritEnvironments": [ "mingw_i686" ], + "cmakeCommandArgs": "-DMSYS=1", + "buildCommandArgs": "-v", + "ctestCommandArgs": "", + "intelliSenseMode": "linux-gcc-x86", + "cmakeToolchain": "cmake\\toolchains\\i686-w64-mingw32.cmake", + "buildRoot": "${workspaceRoot}\\cmake-build-x86-release" + } + ] +} \ No newline at end of file diff --git a/cmake/toolchains/i686-w64-mingw32.cmake b/cmake/toolchains/i686-w64-mingw32.cmake new file mode 100644 index 00000000..343867fc --- /dev/null +++ b/cmake/toolchains/i686-w64-mingw32.cmake @@ -0,0 +1,21 @@ +if(AOM_BUILD_CMAKE_TOOLCHAINS_I686_MINGW_GCC_CMAKE_) + return() +endif() # AOM_BUILD_CMAKE_TOOLCHAINS_I686_MINGW_GCC_CMAKE_ +set(AOM_BUILD_CMAKE_TOOLCHAINS_I686_MINGW_GCC_CMAKE_ 1) +set(CMAKE_SYSTEM_PROCESSOR "i686") +set(CMAKE_SYSTEM_NAME "Windows") +if("${CROSS}" STREQUAL "") + set(CROSS i686-w64-mingw32-) +endif() +if(NOT CMAKE_C_COMPILER) + set(CMAKE_C_COMPILER ${CROSS}gcc) +endif() +if(NOT CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER ${CROSS}g++) +endif() +if(NOT CMAKE_AR) + set(CMAKE_AR ${CROSS}ar CACHE FILEPATH Archiver) +endif() +if(NOT CMAKE_RANLIB) + set(CMAKE_RANLIB ${CROSS}ranlib CACHE FILEPATH Indexer) +endif() \ No newline at end of file diff --git a/cmake/toolchains/x86_64-w64-mingw32.cmake b/cmake/toolchains/x86_64-w64-mingw32.cmake new file mode 100644 index 00000000..f10d019f --- /dev/null +++ b/cmake/toolchains/x86_64-w64-mingw32.cmake @@ -0,0 +1,21 @@ +if(AOM_BUILD_CMAKE_TOOLCHAINS_X86_64_MINGW_GCC_CMAKE_) + return() +endif() # AOM_BUILD_CMAKE_TOOLCHAINS_X86_64_MINGW_GCC_CMAKE_ +set(AOM_BUILD_CMAKE_TOOLCHAINS_X86_64_MINGW_GCC_CMAKE_ 1) +set(CMAKE_SYSTEM_PROCESSOR "x86_64") +set(CMAKE_SYSTEM_NAME "Windows") +if("${CROSS}" STREQUAL "") + set(CROSS x86_64-w64-mingw32-) +endif() +if(NOT CMAKE_C_COMPILER) + set(CMAKE_C_COMPILER ${CROSS}gcc) +endif() +if(NOT CMAKE_CXX_COMPILER) + set(CMAKE_CXX_COMPILER ${CROSS}g++) +endif() +if(NOT CMAKE_AR) + set(CMAKE_AR ${CROSS}ar CACHE FILEPATH Archiver) +endif() +if(NOT CMAKE_RANLIB) + set(CMAKE_RANLIB ${CROSS}ranlib CACHE FILEPATH Indexer) +endif()