diff options
| author | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-06-12 18:41:42 +0400 |
|---|---|---|
| committer | XhmikosR <xhmikosr@users.sourceforge.net> | 2012-06-12 18:41:42 +0400 |
| commit | d01b88f01402c386d65747f0a6918a6b87166997 (patch) | |
| tree | e1bf813bf96f66cc753cbb7b08221fad3b82d06a /src | |
| parent | 0d3331f833bd73b9ebbd7b52f5631077f8b42122 (diff) | |
add YASM.bat, so that everything compiles fine through VS IDE too. Still the only requirement is to set the needed environment variables in build.user.bat in the root folder
Based on a patch by bobdynlan
git-svn-id: https://mpc-hc.svn.sourceforge.net/svnroot/mpc-hc/trunk@5102 10f7b99b-c216-0410-bff0-8a66a9350fd8
Diffstat (limited to 'src')
| -rw-r--r-- | src/YASM.bat | 13 | ||||
| -rw-r--r-- | src/YASM.props | 2 | ||||
| -rw-r--r-- | src/common.props | 1 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/YASM.bat b/src/YASM.bat new file mode 100644 index 000000000..155f4a239 --- /dev/null +++ b/src/YASM.bat @@ -0,0 +1,13 @@ +@ECHO OFF
+
+PUSHD %~dp0
+
+IF EXIST "..\build.user.bat" (
+ CALL "..\build.user.bat"
+) ELSE (
+ IF DEFINED MSYS SET MPCHC_MSYS=%MSYS%
+)
+SET PATH=%PATH%;%MPCHC_MSYS%\bin
+
+POPD
+yasm.exe %*
diff --git a/src/YASM.props b/src/YASM.props index cff18a3c1..bc989ab79 100644 --- a/src/YASM.props +++ b/src/YASM.props @@ -11,7 +11,7 @@ </PropertyGroup>
<ItemDefinitionGroup>
<YASM>
- <CommandLineTemplate>yasm -X vc -f $(Platform) [Debug] [Defines] [IncludePaths] -o "$(IntDir)%(Filename).obj" "%(FullPath)"</CommandLineTemplate>
+ <CommandLineTemplate>"$(SolutionDir)src\YASM.bat" -X vc -f $(Platform) [Debug] [Defines] [IncludePaths] -o "$(IntDir)%(Filename).obj" "%(FullPath)"</CommandLineTemplate>
<Outputs>$(IntDir)%(Filename).obj</Outputs>
<ExecutionDescription>YASM: Assembling %(Filename)%(Extension)</ExecutionDescription>
<Debug>False</Debug>
diff --git a/src/common.props b/src/common.props index 27263707c..672d1294d 100644 --- a/src/common.props +++ b/src/common.props @@ -2,7 +2,6 @@ <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
- <ExecutablePath>$(ExecutablePath);%MPCHC_MSYS%\bin;%MPCHC_MINGW32%\bin;%MSYS%\bin;%MINGW32%\bin</ExecutablePath>
<IntDir>$(SolutionDir)bin\obj\$(Configuration)_$(PlatformName)\$(ProjectName)\</IntDir>
<OutDir>$(SolutionDir)bin\lib\$(Configuration)_$(PlatformName)\</OutDir>
<LinkIncremental Condition="'$(Configuration)'=='Debug' Or '$(Configuration)'=='Debug Filter'">true</LinkIncremental>
|