From f1f6bd8679879dec75f1950ce0e4bc717d01a4af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ole=20Andr=C3=A9=20Vadla=20Ravn=C3=A5s?= <oleavr@gmail.com>
Date: Wed, 11 Jul 2018 17:03:16 +0200
Subject: [PATCH] Fix the Windows build system

---
 frida-python-common.props      | 20 ++++++++++----------
 frida-python27.vcxproj.filters |  4 ++--
 frida-python36.vcxproj.filters |  4 ++--
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/frida-python-common.props b/frida-python-common.props
index d91d40e..bac1a73 100644
--- a/frida-python-common.props
+++ b/frida-python-common.props
@@ -6,7 +6,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <CustomBuild Include="src\frida\__init__.py">
+    <CustomBuild Include="frida\__init__.py">
       <FileType>Document</FileType>
       <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Installing frida package</Message>
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Installing frida package</Message>
@@ -14,30 +14,30 @@
       <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Installing frida package</Message>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">rmdir /S /Q $(OutDir)frida 2&gt;NUL
 mkdir $(OutDir)frida || exit 1
-copy /B /Y "$(ProjectDir)src\frida\*.py" $(OutDir)frida || exit 1
+copy /B /Y "$(ProjectDir)frida\*.py" $(OutDir)frida || exit 1
 echo. &gt; $(IntDir)frida-package.stamp</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)frida-package.stamp</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)src\frida\core.py</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)frida\core.py</AdditionalInputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">rmdir /S /Q $(OutDir)frida 2&gt;NUL
 mkdir $(OutDir)frida || exit 1
-copy /B /Y "$(ProjectDir)src\frida\*.py" $(OutDir)frida || exit 1
+copy /B /Y "$(ProjectDir)frida\*.py" $(OutDir)frida || exit 1
 echo. &gt; $(IntDir)frida-package.stamp</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)frida-package.stamp</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)src\frida\core.py</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)frida\core.py</AdditionalInputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">rmdir /S /Q $(OutDir)frida 2&gt;NUL
 mkdir $(OutDir)frida || exit 1
-copy /B /Y "$(ProjectDir)src\frida\*.py" $(OutDir)frida || exit 1
+copy /B /Y "$(ProjectDir)frida\*.py" $(OutDir)frida || exit 1
 echo. &gt; $(IntDir)frida-package.stamp</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)frida-package.stamp</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)src\frida\core.py</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)frida\core.py</AdditionalInputs>
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">rmdir /S /Q $(OutDir)frida 2&gt;NUL
 mkdir $(OutDir)frida || exit 1
-copy /B /Y "$(ProjectDir)src\frida\*.py" $(OutDir)frida || exit 1
+copy /B /Y "$(ProjectDir)frida\*.py" $(OutDir)frida || exit 1
 echo. &gt; $(IntDir)frida-package.stamp</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)frida-package.stamp</Outputs>
-      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)src\frida\core.py</AdditionalInputs>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)frida\core.py</AdditionalInputs>
     </CustomBuild>
-    <None Include="src\frida\core.py" />
+    <None Include="frida\core.py" />
   </ItemGroup>
 
 </Project>
diff --git a/frida-python27.vcxproj.filters b/frida-python27.vcxproj.filters
index d8a2ce8..1f16c05 100644
--- a/frida-python27.vcxproj.filters
+++ b/frida-python27.vcxproj.filters
@@ -23,12 +23,12 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="src\frida\core.py">
+    <None Include="frida\core.py">
       <Filter>Source Files\frida</Filter>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="src\frida\__init__.py">
+    <CustomBuild Include="frida\__init__.py">
       <Filter>Source Files\frida</Filter>
     </CustomBuild>
   </ItemGroup>
diff --git a/frida-python36.vcxproj.filters b/frida-python36.vcxproj.filters
index 842d22e..a19895d 100644
--- a/frida-python36.vcxproj.filters
+++ b/frida-python36.vcxproj.filters
@@ -23,12 +23,12 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="src\frida\core.py">
+    <None Include="frida\core.py">
       <Filter>Source Files\frida</Filter>
     </None>
   </ItemGroup>
   <ItemGroup>
-    <CustomBuild Include="src\frida\__init__.py">
+    <CustomBuild Include="frida\__init__.py">
       <Filter>Source Files\frida</Filter>
     </CustomBuild>
   </ItemGroup>