diff --git a/bindings/msvc_native/prebuild_script.bat b/bindings/msvc_native/prebuild_script.bat deleted file mode 100644 index cc1e602b..00000000 --- a/bindings/msvc_native/prebuild_script.bat +++ /dev/null @@ -1,19 +0,0 @@ -del ..\..\..\qemu\qapi-types.h 2> null -del ..\..\..\qemu\qapi-types.c 2> null - -del ..\..\..\qemu\qapi-visit.h 2> null -del ..\..\..\qemu\qapi-visit.c 2> null - -del ..\..\..\qemu\config-host.h 2> null - -del ..\..\..\qemu\aarch-softmmu\config-target.h 2> null -del ..\..\..\qemu\arm-softmmu\config-target.h 2> null -del ..\..\..\qemu\m68k-softmmu\config-target.h 2> null -del ..\..\..\qemu\mips64el-softmmu\config-target.h 2> null -del ..\..\..\qemu\mips64-softmmu\config-target.h 2> null -del ..\..\..\qemu\mipsel-softmmu\config-target.h 2> null -del ..\..\..\qemu\mips-softmmu\config-target.h 2> null -del ..\..\..\qemu\sparc64-softmmu\config-target.h 2> null -del ..\..\..\qemu\sparc-softmmu\config-target.h 2> null -del ..\..\..\qemu\x86_64-softmmu\config-target.h 2> null -del null diff --git a/make.sh b/make.sh index 967c983e..982780a1 100755 --- a/make.sh +++ b/make.sh @@ -80,6 +80,24 @@ uninstall() { fi } +msvc_update_genfiles() { + cp qemu/qapi-types.h msvc/unicorn/qapi-types.h + cp qemu/qapi-visit.h msvc/unicorn/qapi-visit.h + cp qemu/qapi-types.c msvc/unicorn/unicorn/qapi-types.c + cp qemu/qapi-visit.c msvc/unicorn/unicorn/qapi-visit.c + cp qemu/config-host.h msvc/unicorn/config-host.h + cp qemu/aarch64-softmmu/config-target.h msvc/unicorn/aarch64-softmmu/config-target.h + cp qemu/arm-softmmu/config-target.h msvc/unicorn/arm-softmmu/config-target.h + cp qemu/m68k-softmmu/config-target.h msvc/unicorn/m68k-softmmu/config-target.h + cp qemu/mips64el-softmmu/config-target.h msvc/unicorn/mips64el-softmmu/config-target.h + cp qemu/mips64-softmmu/config-target.h msvc/unicorn/mips64-softmmu/config-target.h + cp qemu/mipsel-softmmu/config-target.h msvc/unicorn/mipsel-softmmu/config-target.h + cp qemu/mips-softmmu/config-target.h msvc/unicorn/mips-softmmu/config-target.h + cp qemu/sparc64-softmmu/config-target.h msvc/unicorn/sparc64-softmmu/config-target.h + cp qemu/sparc-softmmu/config-target.h msvc/unicorn/sparc-softmmu/config-target.h + cp qemu/x86_64-softmmu/config-target.h msvc/unicorn/x86_64-softmmu/config-target.h +} + if [ "$UNAME" = SunOS ]; then [ -z "${MAKE}" ] && MAKE=gmake INSTALL_BIN=ginstall @@ -111,6 +129,7 @@ case "$1" in "ios_armv7s" ) build_iOS armv7s;; "ios_arm64" ) build_iOS arm64;; "linux32" ) build_linux32;; + "msvc_update_genfiles" ) msvc_update_genfiles;; * ) echo "Usage: $0 ["`grep '^ "' $0 | cut -d '"' -f 2 | tr "\\n" "|"`"]" exit 1;; diff --git a/bindings/msvc_native/msvc_native.sln b/msvc/msvc.sln similarity index 50% rename from bindings/msvc_native/msvc_native.sln rename to msvc/msvc.sln index 963d8093..de130302 100644 --- a/bindings/msvc_native/msvc_native.sln +++ b/msvc/msvc.sln @@ -1,36 +1,36 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x86_64-softmmu", "x86_64-softmmu\x86_64-softmmu.vcxproj", "{17077E86-AE7C-41AF-86ED-2BAC03B019BC}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "x86_64-softmmu", "unicorn\x86_64-softmmu\x86_64-softmmu.vcxproj", "{17077E86-AE7C-41AF-86ED-2BAC03B019BC}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicorn", "unicorn\unicorn.vcxproj", "{B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unicorn", "unicorn\unicorn\unicorn.vcxproj", "{B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}" ProjectSection(ProjectDependencies) = postProject {17077E86-AE7C-41AF-86ED-2BAC03B019BC} = {17077E86-AE7C-41AF-86ED-2BAC03B019BC} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample_x86", "sample_x86\sample_x86.vcxproj", "{F8053D66-8267-433A-BF2C-E07E2298C338}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sample_x86", "samples\sample_x86\sample_x86.vcxproj", "{F8053D66-8267-433A-BF2C-E07E2298C338}" ProjectSection(ProjectDependencies) = postProject {17077E86-AE7C-41AF-86ED-2BAC03B019BC} = {17077E86-AE7C-41AF-86ED-2BAC03B019BC} {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96} = {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aarch64-softmmu", "aarch64-softmmu\aarch64-softmmu.vcxproj", "{2A7F483F-CD19-4F84-BBDA-B6A1865E2773}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aarch64-softmmu", "unicorn\aarch64-softmmu\aarch64-softmmu.vcxproj", "{2A7F483F-CD19-4F84-BBDA-B6A1865E2773}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arm-softmmu", "arm-softmmu\arm-softmmu.vcxproj", "{F67EB1EA-DCFA-4758-A2AA-4B570BA78036}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "arm-softmmu", "unicorn\arm-softmmu\arm-softmmu.vcxproj", "{F67EB1EA-DCFA-4758-A2AA-4B570BA78036}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m68k-softmmu", "m68k-softmmu\m68k-softmmu.vcxproj", "{2C5AD347-6E34-463B-8289-00578E43B255}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "m68k-softmmu", "unicorn\m68k-softmmu\m68k-softmmu.vcxproj", "{2C5AD347-6E34-463B-8289-00578E43B255}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mips-softmmu", "mips-softmmu\mips-softmmu.vcxproj", "{63050112-E486-4396-B5E4-303C3BC12D39}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mips-softmmu", "unicorn\mips-softmmu\mips-softmmu.vcxproj", "{63050112-E486-4396-B5E4-303C3BC12D39}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mips64-softmmu", "mips64-softmmu\mips64-softmmu.vcxproj", "{4A9F9353-DB63-460A-BB1C-9CB519DFD414}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mips64-softmmu", "unicorn\mips64-softmmu\mips64-softmmu.vcxproj", "{4A9F9353-DB63-460A-BB1C-9CB519DFD414}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mips64el-softmmu", "mips64el-softmmu\mips64el-softmmu.vcxproj", "{4478909E-6983-425C-9D9F-558CF258E61E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mips64el-softmmu", "unicorn\mips64el-softmmu\mips64el-softmmu.vcxproj", "{4478909E-6983-425C-9D9F-558CF258E61E}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mipsel-softmmu", "mipsel-softmmu\mipsel-softmmu.vcxproj", "{006A7908-ABF3-4D18-BC35-0A29E39B95F9}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mipsel-softmmu", "unicorn\mipsel-softmmu\mipsel-softmmu.vcxproj", "{006A7908-ABF3-4D18-BC35-0A29E39B95F9}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparc-softmmu", "sparc-softmmu\sparc-softmmu.vcxproj", "{698C2D54-475C-446F-B879-F629BBEF75FE}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparc-softmmu", "unicorn\sparc-softmmu\sparc-softmmu.vcxproj", "{698C2D54-475C-446F-B879-F629BBEF75FE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparc64-softmmu", "sparc64-softmmu\sparc64-softmmu.vcxproj", "{8804AD29-E398-480C-AC0F-98EC1B7A51CB}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sparc64-softmmu", "unicorn\sparc64-softmmu\sparc64-softmmu.vcxproj", "{8804AD29-E398-480C-AC0F-98EC1B7A51CB}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "softmmu", "softmmu", "{857A09AF-FE20-461C-B66F-D779422AD46B}" EndProject @@ -38,138 +38,72 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{F8E8 EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Mixed Platforms = Debug|Mixed Platforms Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 - Release|Mixed Platforms = Release|Mixed Platforms Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|Win32.ActiveCfg = Debug|x64 - {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|Win32.Build.0 = Debug|x64 - {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|x64.ActiveCfg = Debug|Win32 - {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|x64.Build.0 = Debug|Win32 - {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Release|Mixed Platforms.Build.0 = Release|Win32 + {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|Win32.ActiveCfg = Debug|Win32 + {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|Win32.Build.0 = Debug|Win32 + {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|x64.ActiveCfg = Debug|x64 + {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Debug|x64.Build.0 = Debug|x64 {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Release|Win32.ActiveCfg = Release|Win32 {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Release|Win32.Build.0 = Release|Win32 {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Release|x64.ActiveCfg = Release|x64 {17077E86-AE7C-41AF-86ED-2BAC03B019BC}.Release|x64.Build.0 = Release|x64 - {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug|Win32.ActiveCfg = Debug|x64 - {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug|Win32.Build.0 = Debug|x64 - {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug|x64.ActiveCfg = Debug|Win32 - {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug|x64.Build.0 = Debug|Win32 - {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Release|Mixed Platforms.Build.0 = Release|Win32 + {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug|Win32.ActiveCfg = Debug|Win32 + {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug|Win32.Build.0 = Debug|Win32 + {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug|x64.ActiveCfg = Debug|x64 + {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Debug|x64.Build.0 = Debug|x64 {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Release|Win32.ActiveCfg = Release|Win32 {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Release|Win32.Build.0 = Release|Win32 - {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Release|x64.ActiveCfg = Release|Win32 - {F8053D66-8267-433A-BF2C-E07E2298C338}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {F8053D66-8267-433A-BF2C-E07E2298C338}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {F8053D66-8267-433A-BF2C-E07E2298C338}.Debug|Win32.ActiveCfg = Debug|x64 - {F8053D66-8267-433A-BF2C-E07E2298C338}.Debug|Win32.Build.0 = Debug|x64 - {F8053D66-8267-433A-BF2C-E07E2298C338}.Debug|x64.ActiveCfg = Debug|Win32 - {F8053D66-8267-433A-BF2C-E07E2298C338}.Debug|x64.Build.0 = Debug|Win32 - {F8053D66-8267-433A-BF2C-E07E2298C338}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {F8053D66-8267-433A-BF2C-E07E2298C338}.Release|Mixed Platforms.Build.0 = Release|Win32 + {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Release|x64.ActiveCfg = Release|x64 + {B6EFD6D7-C2D4-4FBB-B363-2E08CE09CC96}.Release|x64.Build.0 = Release|x64 + {F8053D66-8267-433A-BF2C-E07E2298C338}.Debug|Win32.ActiveCfg = Debug|Win32 + {F8053D66-8267-433A-BF2C-E07E2298C338}.Debug|Win32.Build.0 = Debug|Win32 + {F8053D66-8267-433A-BF2C-E07E2298C338}.Debug|x64.ActiveCfg = Debug|x64 + {F8053D66-8267-433A-BF2C-E07E2298C338}.Debug|x64.Build.0 = Debug|x64 {F8053D66-8267-433A-BF2C-E07E2298C338}.Release|Win32.ActiveCfg = Release|Win32 {F8053D66-8267-433A-BF2C-E07E2298C338}.Release|Win32.Build.0 = Release|Win32 - {F8053D66-8267-433A-BF2C-E07E2298C338}.Release|x64.ActiveCfg = Release|Win32 - {2A7F483F-CD19-4F84-BBDA-B6A1865E2773}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {2A7F483F-CD19-4F84-BBDA-B6A1865E2773}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {2A7F483F-CD19-4F84-BBDA-B6A1865E2773}.Debug|Win32.ActiveCfg = Debug|x64 - {2A7F483F-CD19-4F84-BBDA-B6A1865E2773}.Debug|Win32.Build.0 = Debug|x64 - {2A7F483F-CD19-4F84-BBDA-B6A1865E2773}.Debug|x64.ActiveCfg = Debug|Win32 - {2A7F483F-CD19-4F84-BBDA-B6A1865E2773}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {2A7F483F-CD19-4F84-BBDA-B6A1865E2773}.Release|Mixed Platforms.Build.0 = Release|Win32 + {F8053D66-8267-433A-BF2C-E07E2298C338}.Release|x64.ActiveCfg = Release|x64 + {F8053D66-8267-433A-BF2C-E07E2298C338}.Release|x64.Build.0 = Release|x64 + {2A7F483F-CD19-4F84-BBDA-B6A1865E2773}.Debug|Win32.ActiveCfg = Debug|Win32 + {2A7F483F-CD19-4F84-BBDA-B6A1865E2773}.Debug|x64.ActiveCfg = Debug|x64 {2A7F483F-CD19-4F84-BBDA-B6A1865E2773}.Release|Win32.ActiveCfg = Release|Win32 - {2A7F483F-CD19-4F84-BBDA-B6A1865E2773}.Release|Win32.Build.0 = Release|Win32 - {2A7F483F-CD19-4F84-BBDA-B6A1865E2773}.Release|x64.ActiveCfg = Release|Win32 - {F67EB1EA-DCFA-4758-A2AA-4B570BA78036}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {F67EB1EA-DCFA-4758-A2AA-4B570BA78036}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {F67EB1EA-DCFA-4758-A2AA-4B570BA78036}.Debug|Win32.ActiveCfg = Debug|x64 - {F67EB1EA-DCFA-4758-A2AA-4B570BA78036}.Debug|Win32.Build.0 = Debug|x64 - {F67EB1EA-DCFA-4758-A2AA-4B570BA78036}.Debug|x64.ActiveCfg = Debug|Win32 - {F67EB1EA-DCFA-4758-A2AA-4B570BA78036}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {F67EB1EA-DCFA-4758-A2AA-4B570BA78036}.Release|Mixed Platforms.Build.0 = Release|Win32 + {2A7F483F-CD19-4F84-BBDA-B6A1865E2773}.Release|x64.ActiveCfg = Release|x64 + {F67EB1EA-DCFA-4758-A2AA-4B570BA78036}.Debug|Win32.ActiveCfg = Debug|Win32 + {F67EB1EA-DCFA-4758-A2AA-4B570BA78036}.Debug|x64.ActiveCfg = Debug|x64 {F67EB1EA-DCFA-4758-A2AA-4B570BA78036}.Release|Win32.ActiveCfg = Release|Win32 - {F67EB1EA-DCFA-4758-A2AA-4B570BA78036}.Release|Win32.Build.0 = Release|Win32 - {F67EB1EA-DCFA-4758-A2AA-4B570BA78036}.Release|x64.ActiveCfg = Release|Win32 - {2C5AD347-6E34-463B-8289-00578E43B255}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {2C5AD347-6E34-463B-8289-00578E43B255}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {2C5AD347-6E34-463B-8289-00578E43B255}.Debug|Win32.ActiveCfg = Debug|x64 - {2C5AD347-6E34-463B-8289-00578E43B255}.Debug|Win32.Build.0 = Debug|x64 - {2C5AD347-6E34-463B-8289-00578E43B255}.Debug|x64.ActiveCfg = Debug|Win32 - {2C5AD347-6E34-463B-8289-00578E43B255}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {2C5AD347-6E34-463B-8289-00578E43B255}.Release|Mixed Platforms.Build.0 = Release|Win32 + {F67EB1EA-DCFA-4758-A2AA-4B570BA78036}.Release|x64.ActiveCfg = Release|x64 + {2C5AD347-6E34-463B-8289-00578E43B255}.Debug|Win32.ActiveCfg = Debug|Win32 + {2C5AD347-6E34-463B-8289-00578E43B255}.Debug|x64.ActiveCfg = Debug|x64 {2C5AD347-6E34-463B-8289-00578E43B255}.Release|Win32.ActiveCfg = Release|Win32 - {2C5AD347-6E34-463B-8289-00578E43B255}.Release|Win32.Build.0 = Release|Win32 - {2C5AD347-6E34-463B-8289-00578E43B255}.Release|x64.ActiveCfg = Release|Win32 - {63050112-E486-4396-B5E4-303C3BC12D39}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {63050112-E486-4396-B5E4-303C3BC12D39}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {63050112-E486-4396-B5E4-303C3BC12D39}.Debug|Win32.ActiveCfg = Debug|x64 - {63050112-E486-4396-B5E4-303C3BC12D39}.Debug|Win32.Build.0 = Debug|x64 - {63050112-E486-4396-B5E4-303C3BC12D39}.Debug|x64.ActiveCfg = Debug|Win32 - {63050112-E486-4396-B5E4-303C3BC12D39}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {63050112-E486-4396-B5E4-303C3BC12D39}.Release|Mixed Platforms.Build.0 = Release|Win32 + {2C5AD347-6E34-463B-8289-00578E43B255}.Release|x64.ActiveCfg = Release|x64 + {63050112-E486-4396-B5E4-303C3BC12D39}.Debug|Win32.ActiveCfg = Debug|Win32 + {63050112-E486-4396-B5E4-303C3BC12D39}.Debug|x64.ActiveCfg = Debug|x64 {63050112-E486-4396-B5E4-303C3BC12D39}.Release|Win32.ActiveCfg = Release|Win32 - {63050112-E486-4396-B5E4-303C3BC12D39}.Release|Win32.Build.0 = Release|Win32 - {63050112-E486-4396-B5E4-303C3BC12D39}.Release|x64.ActiveCfg = Release|Win32 - {4A9F9353-DB63-460A-BB1C-9CB519DFD414}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {4A9F9353-DB63-460A-BB1C-9CB519DFD414}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {4A9F9353-DB63-460A-BB1C-9CB519DFD414}.Debug|Win32.ActiveCfg = Debug|x64 - {4A9F9353-DB63-460A-BB1C-9CB519DFD414}.Debug|Win32.Build.0 = Debug|x64 - {4A9F9353-DB63-460A-BB1C-9CB519DFD414}.Debug|x64.ActiveCfg = Debug|Win32 - {4A9F9353-DB63-460A-BB1C-9CB519DFD414}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {4A9F9353-DB63-460A-BB1C-9CB519DFD414}.Release|Mixed Platforms.Build.0 = Release|Win32 + {63050112-E486-4396-B5E4-303C3BC12D39}.Release|x64.ActiveCfg = Release|x64 + {4A9F9353-DB63-460A-BB1C-9CB519DFD414}.Debug|Win32.ActiveCfg = Debug|Win32 + {4A9F9353-DB63-460A-BB1C-9CB519DFD414}.Debug|x64.ActiveCfg = Debug|x64 {4A9F9353-DB63-460A-BB1C-9CB519DFD414}.Release|Win32.ActiveCfg = Release|Win32 - {4A9F9353-DB63-460A-BB1C-9CB519DFD414}.Release|Win32.Build.0 = Release|Win32 - {4A9F9353-DB63-460A-BB1C-9CB519DFD414}.Release|x64.ActiveCfg = Release|Win32 - {4478909E-6983-425C-9D9F-558CF258E61E}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {4478909E-6983-425C-9D9F-558CF258E61E}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {4478909E-6983-425C-9D9F-558CF258E61E}.Debug|Win32.ActiveCfg = Debug|x64 - {4478909E-6983-425C-9D9F-558CF258E61E}.Debug|Win32.Build.0 = Debug|x64 - {4478909E-6983-425C-9D9F-558CF258E61E}.Debug|x64.ActiveCfg = Debug|Win32 - {4478909E-6983-425C-9D9F-558CF258E61E}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {4478909E-6983-425C-9D9F-558CF258E61E}.Release|Mixed Platforms.Build.0 = Release|Win32 + {4A9F9353-DB63-460A-BB1C-9CB519DFD414}.Release|x64.ActiveCfg = Release|x64 + {4478909E-6983-425C-9D9F-558CF258E61E}.Debug|Win32.ActiveCfg = Debug|Win32 + {4478909E-6983-425C-9D9F-558CF258E61E}.Debug|x64.ActiveCfg = Debug|x64 {4478909E-6983-425C-9D9F-558CF258E61E}.Release|Win32.ActiveCfg = Release|Win32 - {4478909E-6983-425C-9D9F-558CF258E61E}.Release|Win32.Build.0 = Release|Win32 - {4478909E-6983-425C-9D9F-558CF258E61E}.Release|x64.ActiveCfg = Release|Win32 - {006A7908-ABF3-4D18-BC35-0A29E39B95F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {006A7908-ABF3-4D18-BC35-0A29E39B95F9}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {006A7908-ABF3-4D18-BC35-0A29E39B95F9}.Debug|Win32.ActiveCfg = Debug|x64 - {006A7908-ABF3-4D18-BC35-0A29E39B95F9}.Debug|Win32.Build.0 = Debug|x64 - {006A7908-ABF3-4D18-BC35-0A29E39B95F9}.Debug|x64.ActiveCfg = Debug|Win32 - {006A7908-ABF3-4D18-BC35-0A29E39B95F9}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {006A7908-ABF3-4D18-BC35-0A29E39B95F9}.Release|Mixed Platforms.Build.0 = Release|Win32 + {4478909E-6983-425C-9D9F-558CF258E61E}.Release|x64.ActiveCfg = Release|x64 + {006A7908-ABF3-4D18-BC35-0A29E39B95F9}.Debug|Win32.ActiveCfg = Debug|Win32 + {006A7908-ABF3-4D18-BC35-0A29E39B95F9}.Debug|x64.ActiveCfg = Debug|x64 {006A7908-ABF3-4D18-BC35-0A29E39B95F9}.Release|Win32.ActiveCfg = Release|Win32 - {006A7908-ABF3-4D18-BC35-0A29E39B95F9}.Release|Win32.Build.0 = Release|Win32 - {006A7908-ABF3-4D18-BC35-0A29E39B95F9}.Release|x64.ActiveCfg = Release|Win32 - {698C2D54-475C-446F-B879-F629BBEF75FE}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {698C2D54-475C-446F-B879-F629BBEF75FE}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {698C2D54-475C-446F-B879-F629BBEF75FE}.Debug|Win32.ActiveCfg = Debug|x64 - {698C2D54-475C-446F-B879-F629BBEF75FE}.Debug|Win32.Build.0 = Debug|x64 - {698C2D54-475C-446F-B879-F629BBEF75FE}.Debug|x64.ActiveCfg = Debug|Win32 - {698C2D54-475C-446F-B879-F629BBEF75FE}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {698C2D54-475C-446F-B879-F629BBEF75FE}.Release|Mixed Platforms.Build.0 = Release|Win32 + {006A7908-ABF3-4D18-BC35-0A29E39B95F9}.Release|x64.ActiveCfg = Release|x64 + {698C2D54-475C-446F-B879-F629BBEF75FE}.Debug|Win32.ActiveCfg = Debug|Win32 + {698C2D54-475C-446F-B879-F629BBEF75FE}.Debug|x64.ActiveCfg = Debug|x64 {698C2D54-475C-446F-B879-F629BBEF75FE}.Release|Win32.ActiveCfg = Release|Win32 - {698C2D54-475C-446F-B879-F629BBEF75FE}.Release|Win32.Build.0 = Release|Win32 - {698C2D54-475C-446F-B879-F629BBEF75FE}.Release|x64.ActiveCfg = Release|Win32 - {8804AD29-E398-480C-AC0F-98EC1B7A51CB}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {8804AD29-E398-480C-AC0F-98EC1B7A51CB}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {8804AD29-E398-480C-AC0F-98EC1B7A51CB}.Debug|Win32.ActiveCfg = Debug|x64 - {8804AD29-E398-480C-AC0F-98EC1B7A51CB}.Debug|Win32.Build.0 = Debug|x64 - {8804AD29-E398-480C-AC0F-98EC1B7A51CB}.Debug|x64.ActiveCfg = Debug|Win32 - {8804AD29-E398-480C-AC0F-98EC1B7A51CB}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {8804AD29-E398-480C-AC0F-98EC1B7A51CB}.Release|Mixed Platforms.Build.0 = Release|Win32 + {698C2D54-475C-446F-B879-F629BBEF75FE}.Release|x64.ActiveCfg = Release|x64 + {8804AD29-E398-480C-AC0F-98EC1B7A51CB}.Debug|Win32.ActiveCfg = Debug|Win32 + {8804AD29-E398-480C-AC0F-98EC1B7A51CB}.Debug|x64.ActiveCfg = Debug|x64 {8804AD29-E398-480C-AC0F-98EC1B7A51CB}.Release|Win32.ActiveCfg = Release|Win32 - {8804AD29-E398-480C-AC0F-98EC1B7A51CB}.Release|Win32.Build.0 = Release|Win32 - {8804AD29-E398-480C-AC0F-98EC1B7A51CB}.Release|x64.ActiveCfg = Release|Win32 + {8804AD29-E398-480C-AC0F-98EC1B7A51CB}.Release|x64.ActiveCfg = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -178,12 +112,12 @@ Global {2A7F483F-CD19-4F84-BBDA-B6A1865E2773} = {857A09AF-FE20-461C-B66F-D779422AD46B} {F67EB1EA-DCFA-4758-A2AA-4B570BA78036} = {857A09AF-FE20-461C-B66F-D779422AD46B} {2C5AD347-6E34-463B-8289-00578E43B255} = {857A09AF-FE20-461C-B66F-D779422AD46B} - {4478909E-6983-425C-9D9F-558CF258E61E} = {857A09AF-FE20-461C-B66F-D779422AD46B} - {4A9F9353-DB63-460A-BB1C-9CB519DFD414} = {857A09AF-FE20-461C-B66F-D779422AD46B} - {006A7908-ABF3-4D18-BC35-0A29E39B95F9} = {857A09AF-FE20-461C-B66F-D779422AD46B} {63050112-E486-4396-B5E4-303C3BC12D39} = {857A09AF-FE20-461C-B66F-D779422AD46B} - {8804AD29-E398-480C-AC0F-98EC1B7A51CB} = {857A09AF-FE20-461C-B66F-D779422AD46B} + {4A9F9353-DB63-460A-BB1C-9CB519DFD414} = {857A09AF-FE20-461C-B66F-D779422AD46B} + {4478909E-6983-425C-9D9F-558CF258E61E} = {857A09AF-FE20-461C-B66F-D779422AD46B} + {006A7908-ABF3-4D18-BC35-0A29E39B95F9} = {857A09AF-FE20-461C-B66F-D779422AD46B} {698C2D54-475C-446F-B879-F629BBEF75FE} = {857A09AF-FE20-461C-B66F-D779422AD46B} + {8804AD29-E398-480C-AC0F-98EC1B7A51CB} = {857A09AF-FE20-461C-B66F-D779422AD46B} {17077E86-AE7C-41AF-86ED-2BAC03B019BC} = {857A09AF-FE20-461C-B66F-D779422AD46B} {F8053D66-8267-433A-BF2C-E07E2298C338} = {F8E85E25-4D67-4A6B-A976-C920790B8798} EndGlobalSection diff --git a/bindings/msvc_native/readme.txt b/msvc/readme.txt similarity index 100% rename from bindings/msvc_native/readme.txt rename to msvc/readme.txt diff --git a/bindings/msvc_native/sample_x86/sample_x86.vcxproj b/msvc/samples/sample_x86/sample_x86.vcxproj similarity index 97% rename from bindings/msvc_native/sample_x86/sample_x86.vcxproj rename to msvc/samples/sample_x86/sample_x86.vcxproj index c7e2e0ca..24aef9a5 100644 --- a/bindings/msvc_native/sample_x86/sample_x86.vcxproj +++ b/msvc/samples/sample_x86/sample_x86.vcxproj @@ -101,7 +101,8 @@ $(SolutionDir)$(Platform)\$(Configuration)\ - ..\prebuild_script.bat + + @@ -121,7 +122,8 @@ $(SolutionDir)$(Platform)\$(Configuration)\ - ..\prebuild_script.bat + + @@ -145,7 +147,8 @@ $(SolutionDir)$(Platform)\$(Configuration)\ - ..\prebuild_script.bat + + @@ -169,7 +172,8 @@ $(SolutionDir)$(Platform)\$(Configuration)\ - ..\prebuild_script.bat + + diff --git a/bindings/msvc_native/sample_x86/sample_x86.vcxproj.filters b/msvc/samples/sample_x86/sample_x86.vcxproj.filters similarity index 100% rename from bindings/msvc_native/sample_x86/sample_x86.vcxproj.filters rename to msvc/samples/sample_x86/sample_x86.vcxproj.filters diff --git a/bindings/msvc_native/aarch64-softmmu/aarch64-softmmu.vcxproj b/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj similarity index 100% rename from bindings/msvc_native/aarch64-softmmu/aarch64-softmmu.vcxproj rename to msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj diff --git a/bindings/msvc_native/aarch64-softmmu/aarch64-softmmu.vcxproj.filters b/msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj.filters similarity index 100% rename from bindings/msvc_native/aarch64-softmmu/aarch64-softmmu.vcxproj.filters rename to msvc/unicorn/aarch64-softmmu/aarch64-softmmu.vcxproj.filters diff --git a/bindings/msvc_native/aarch64-softmmu/config-target.h b/msvc/unicorn/aarch64-softmmu/config-target.h similarity index 100% rename from bindings/msvc_native/aarch64-softmmu/config-target.h rename to msvc/unicorn/aarch64-softmmu/config-target.h diff --git a/bindings/msvc_native/arm-softmmu/arm-softmmu.vcxproj b/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj similarity index 100% rename from bindings/msvc_native/arm-softmmu/arm-softmmu.vcxproj rename to msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj diff --git a/bindings/msvc_native/arm-softmmu/arm-softmmu.vcxproj.filters b/msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj.filters similarity index 100% rename from bindings/msvc_native/arm-softmmu/arm-softmmu.vcxproj.filters rename to msvc/unicorn/arm-softmmu/arm-softmmu.vcxproj.filters diff --git a/bindings/msvc_native/arm-softmmu/config-target.h b/msvc/unicorn/arm-softmmu/config-target.h similarity index 100% rename from bindings/msvc_native/arm-softmmu/config-target.h rename to msvc/unicorn/arm-softmmu/config-target.h diff --git a/bindings/msvc_native/config-host.h b/msvc/unicorn/config-host.h similarity index 100% rename from bindings/msvc_native/config-host.h rename to msvc/unicorn/config-host.h diff --git a/bindings/msvc_native/m68k-softmmu/config-target.h b/msvc/unicorn/m68k-softmmu/config-target.h similarity index 100% rename from bindings/msvc_native/m68k-softmmu/config-target.h rename to msvc/unicorn/m68k-softmmu/config-target.h diff --git a/bindings/msvc_native/m68k-softmmu/m68k-softmmu.vcxproj b/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj similarity index 100% rename from bindings/msvc_native/m68k-softmmu/m68k-softmmu.vcxproj rename to msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj diff --git a/bindings/msvc_native/m68k-softmmu/m68k-softmmu.vcxproj.filters b/msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj.filters similarity index 100% rename from bindings/msvc_native/m68k-softmmu/m68k-softmmu.vcxproj.filters rename to msvc/unicorn/m68k-softmmu/m68k-softmmu.vcxproj.filters diff --git a/bindings/msvc_native/mips-softmmu/config-target.h b/msvc/unicorn/mips-softmmu/config-target.h similarity index 100% rename from bindings/msvc_native/mips-softmmu/config-target.h rename to msvc/unicorn/mips-softmmu/config-target.h diff --git a/bindings/msvc_native/mips-softmmu/mips-softmmu.vcxproj b/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj similarity index 100% rename from bindings/msvc_native/mips-softmmu/mips-softmmu.vcxproj rename to msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj diff --git a/bindings/msvc_native/mips-softmmu/mips-softmmu.vcxproj.filters b/msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj.filters similarity index 100% rename from bindings/msvc_native/mips-softmmu/mips-softmmu.vcxproj.filters rename to msvc/unicorn/mips-softmmu/mips-softmmu.vcxproj.filters diff --git a/bindings/msvc_native/mips64-softmmu/config-target.h b/msvc/unicorn/mips64-softmmu/config-target.h similarity index 100% rename from bindings/msvc_native/mips64-softmmu/config-target.h rename to msvc/unicorn/mips64-softmmu/config-target.h diff --git a/bindings/msvc_native/mips64-softmmu/mips64-softmmu.vcxproj b/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj similarity index 100% rename from bindings/msvc_native/mips64-softmmu/mips64-softmmu.vcxproj rename to msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj diff --git a/bindings/msvc_native/mips64-softmmu/mips64-softmmu.vcxproj.filters b/msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj.filters similarity index 100% rename from bindings/msvc_native/mips64-softmmu/mips64-softmmu.vcxproj.filters rename to msvc/unicorn/mips64-softmmu/mips64-softmmu.vcxproj.filters diff --git a/bindings/msvc_native/mips64el-softmmu/config-target.h b/msvc/unicorn/mips64el-softmmu/config-target.h similarity index 100% rename from bindings/msvc_native/mips64el-softmmu/config-target.h rename to msvc/unicorn/mips64el-softmmu/config-target.h diff --git a/bindings/msvc_native/mips64el-softmmu/mips64el-softmmu.vcxproj b/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj similarity index 100% rename from bindings/msvc_native/mips64el-softmmu/mips64el-softmmu.vcxproj rename to msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj diff --git a/bindings/msvc_native/mips64el-softmmu/mips64el-softmmu.vcxproj.filters b/msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj.filters similarity index 100% rename from bindings/msvc_native/mips64el-softmmu/mips64el-softmmu.vcxproj.filters rename to msvc/unicorn/mips64el-softmmu/mips64el-softmmu.vcxproj.filters diff --git a/bindings/msvc_native/mipsel-softmmu/config-target.h b/msvc/unicorn/mipsel-softmmu/config-target.h similarity index 100% rename from bindings/msvc_native/mipsel-softmmu/config-target.h rename to msvc/unicorn/mipsel-softmmu/config-target.h diff --git a/bindings/msvc_native/mipsel-softmmu/mipsel-softmmu.vcxproj b/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj similarity index 100% rename from bindings/msvc_native/mipsel-softmmu/mipsel-softmmu.vcxproj rename to msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj diff --git a/bindings/msvc_native/mipsel-softmmu/mipsel-softmmu.vcxproj.filters b/msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj.filters similarity index 100% rename from bindings/msvc_native/mipsel-softmmu/mipsel-softmmu.vcxproj.filters rename to msvc/unicorn/mipsel-softmmu/mipsel-softmmu.vcxproj.filters diff --git a/msvc/unicorn/prebuild_script.bat b/msvc/unicorn/prebuild_script.bat new file mode 100644 index 00000000..c421fc5a --- /dev/null +++ b/msvc/unicorn/prebuild_script.bat @@ -0,0 +1,19 @@ +del ..\..\qemu\qapi-types.h 2> null +del ..\..\qemu\qapi-types.c 2> null + +del ..\..\qemu\qapi-visit.h 2> null +del ..\..\qemu\qapi-visit.c 2> null + +del ..\..\qemu\config-host.h 2> null + +del ..\..\qemu\aarch-softmmu\config-target.h 2> null +del ..\..\qemu\arm-softmmu\config-target.h 2> null +del ..\..\qemu\m68k-softmmu\config-target.h 2> null +del ..\..\qemu\mips64el-softmmu\config-target.h 2> null +del ..\..\qemu\mips64-softmmu\config-target.h 2> null +del ..\..\qemu\mipsel-softmmu\config-target.h 2> null +del ..\..\qemu\mips-softmmu\config-target.h 2> null +del ..\..\qemu\sparc64-softmmu\config-target.h 2> null +del ..\..\qemu\sparc-softmmu\config-target.h 2> null +del ..\..\qemu\x86_64-softmmu\config-target.h 2> null +del null diff --git a/bindings/msvc_native/qapi-types.h b/msvc/unicorn/qapi-types.h similarity index 100% rename from bindings/msvc_native/qapi-types.h rename to msvc/unicorn/qapi-types.h diff --git a/bindings/msvc_native/qapi-visit.h b/msvc/unicorn/qapi-visit.h similarity index 100% rename from bindings/msvc_native/qapi-visit.h rename to msvc/unicorn/qapi-visit.h diff --git a/bindings/msvc_native/sparc-softmmu/config-target.h b/msvc/unicorn/sparc-softmmu/config-target.h similarity index 100% rename from bindings/msvc_native/sparc-softmmu/config-target.h rename to msvc/unicorn/sparc-softmmu/config-target.h diff --git a/bindings/msvc_native/sparc-softmmu/sparc-softmmu.vcxproj b/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj similarity index 100% rename from bindings/msvc_native/sparc-softmmu/sparc-softmmu.vcxproj rename to msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj diff --git a/bindings/msvc_native/sparc-softmmu/sparc-softmmu.vcxproj.filters b/msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj.filters similarity index 100% rename from bindings/msvc_native/sparc-softmmu/sparc-softmmu.vcxproj.filters rename to msvc/unicorn/sparc-softmmu/sparc-softmmu.vcxproj.filters diff --git a/bindings/msvc_native/sparc64-softmmu/config-target.h b/msvc/unicorn/sparc64-softmmu/config-target.h similarity index 100% rename from bindings/msvc_native/sparc64-softmmu/config-target.h rename to msvc/unicorn/sparc64-softmmu/config-target.h diff --git a/bindings/msvc_native/sparc64-softmmu/sparc64-softmmu.vcxproj b/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj similarity index 100% rename from bindings/msvc_native/sparc64-softmmu/sparc64-softmmu.vcxproj rename to msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj diff --git a/bindings/msvc_native/sparc64-softmmu/sparc64-softmmu.vcxproj.filters b/msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj.filters similarity index 100% rename from bindings/msvc_native/sparc64-softmmu/sparc64-softmmu.vcxproj.filters rename to msvc/unicorn/sparc64-softmmu/sparc64-softmmu.vcxproj.filters diff --git a/bindings/msvc_native/unicorn/qapi-types.c b/msvc/unicorn/unicorn/qapi-types.c similarity index 100% rename from bindings/msvc_native/unicorn/qapi-types.c rename to msvc/unicorn/unicorn/qapi-types.c diff --git a/bindings/msvc_native/unicorn/qapi-visit.c b/msvc/unicorn/unicorn/qapi-visit.c similarity index 100% rename from bindings/msvc_native/unicorn/qapi-visit.c rename to msvc/unicorn/unicorn/qapi-visit.c diff --git a/bindings/msvc_native/unicorn/unicorn.vcxproj b/msvc/unicorn/unicorn/unicorn.vcxproj similarity index 98% rename from bindings/msvc_native/unicorn/unicorn.vcxproj rename to msvc/unicorn/unicorn/unicorn.vcxproj index e71595d2..bd6f3596 100644 --- a/bindings/msvc_native/unicorn/unicorn.vcxproj +++ b/msvc/unicorn/unicorn/unicorn.vcxproj @@ -250,6 +250,9 @@ $(SolutionDir)$(Platform)\$(Configuration)\ ws2_32.lib;x86_64-softmmu.lib + + ..\prebuild_script.bat + @@ -271,6 +274,9 @@ $(SolutionDir)$(Platform)\$(Configuration)\ ws2_32.lib;x86_64-softmmu.lib + + ..\prebuild_script.bat + @@ -296,6 +302,9 @@ $(SolutionDir)$(Platform)\$(Configuration)\ ws2_32.lib;x86_64-softmmu.lib + + ..\prebuild_script.bat + @@ -321,6 +330,9 @@ $(SolutionDir)$(Platform)\$(Configuration)\ ws2_32.lib;x86_64-softmmu.lib + + ..\prebuild_script.bat + diff --git a/bindings/msvc_native/unicorn/unicorn.vcxproj.filters b/msvc/unicorn/unicorn/unicorn.vcxproj.filters similarity index 100% rename from bindings/msvc_native/unicorn/unicorn.vcxproj.filters rename to msvc/unicorn/unicorn/unicorn.vcxproj.filters diff --git a/bindings/msvc_native/x86_64-softmmu/config-target.h b/msvc/unicorn/x86_64-softmmu/config-target.h similarity index 100% rename from bindings/msvc_native/x86_64-softmmu/config-target.h rename to msvc/unicorn/x86_64-softmmu/config-target.h diff --git a/bindings/msvc_native/x86_64-softmmu/x86_64-softmmu.vcxproj b/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj similarity index 98% rename from bindings/msvc_native/x86_64-softmmu/x86_64-softmmu.vcxproj rename to msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj index b12d0125..21e50c15 100644 --- a/bindings/msvc_native/x86_64-softmmu/x86_64-softmmu.vcxproj +++ b/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj @@ -138,7 +138,7 @@ Disabled WIN32;_DEBUG;_LIB;__i386__;%(PreprocessorDefinitions);_CRT_SECURE_NO_WARNINGS;inline=__inline;__func__=__FUNCTION__;NEED_CPU_H MultiThreadedDebug - ../../msvc_native;..;.;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-i386;../../../include + .;..;../../../qemu;../../../qemu/include;../../../qemu/tcg;../../../qemu/tcg/i386;../../../qemu/target-i386;../../../include x86_64.h /wd4018 /wd4244 /wd4267 %(AdditionalOptions) false diff --git a/bindings/msvc_native/x86_64-softmmu/x86_64-softmmu.vcxproj.filters b/msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj.filters similarity index 100% rename from bindings/msvc_native/x86_64-softmmu/x86_64-softmmu.vcxproj.filters rename to msvc/unicorn/x86_64-softmmu/x86_64-softmmu.vcxproj.filters