Changeset 572


Ignore:
Timestamp:
Jan 20, 2016, 2:48:16 AM (6 years ago)
Author:
roman
Message:

Upgraded to VS 2013 and checked with current Zeranoe FFmpeg

Location:
trunk/Utilities/FFmpeg/FFmpegApp
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Utilities/FFmpeg/FFmpegApp

    • Property svn:ignore
      •  

        old new  
        22*.user
        33*.suo
         4Debug
  • trunk/Utilities/FFmpeg/FFmpegApp/FFmpegApp.cpp

    r113 r572  
    11////////////////////////////////////////////////////////////
    2 // Copyright (C) Roman Ryltsov, 2008-2012
     2// Copyright (C) Roman Ryltsov, 2008-2016
    33// Created by Roman Ryltsov roman@alax.info
    4 //
    5 // $Id$
    64
    75#include "stdafx.h"
     
    97extern "C"
    108{
    11         #include "dev\include\libavcodec\avcodec.h"
     9        // NOTE: Additional directory ..\zeranoe.com\dev\include gets to the files
     10        #include "libavcodec\avcodec.h"
    1211}
    1312
    14 #pragma comment(lib, "dev\\lib\\avcodec.lib")
     13// NOTE: Additional directory ..\zeranoe.com\dev\lib gets to the files
     14#pragma comment(lib, "avcodec.lib")
    1515
     16// NOTE: Be sure to copy DLL files from ..\zeranoe.com\shared\bin to the directory of the FFmpegApp.exe binary
    1617int _tmain(int argc, _TCHAR* argv[])
    1718{
  • trunk/Utilities/FFmpeg/FFmpegApp/FFmpegApp.sln

    r113 r572  
    11
    22Microsoft Visual Studio Solution File, Format Version 11.00
    3 # Visual Studio 2010
     3# Visual Studio 2013
    44Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FFmpegApp", "FFmpegApp.vcxproj", "{7F308D39-6E31-4021-AF44-036A37ABE53A}"
    55EndProject
  • trunk/Utilities/FFmpeg/FFmpegApp/FFmpegApp.vcxproj

    r113 r572  
    11<?xml version="1.0" encoding="utf-8"?>
    2 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     2<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
    33  <ItemGroup Label="ProjectConfigurations">
    44    <ProjectConfiguration Include="Debug|Win32">
     
    2121    <UseDebugLibraries>true</UseDebugLibraries>
    2222    <CharacterSet>Unicode</CharacterSet>
     23    <PlatformToolset>v120</PlatformToolset>
    2324  </PropertyGroup>
    2425  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     
    2728    <WholeProgramOptimization>true</WholeProgramOptimization>
    2829    <CharacterSet>Unicode</CharacterSet>
     30    <PlatformToolset>v120</PlatformToolset>
    2931  </PropertyGroup>
    3032  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
     
    5153      <Optimization>Disabled</Optimization>
    5254      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    53       <AdditionalIncludeDirectories>.;.\dev\include</AdditionalIncludeDirectories>
     55      <AdditionalIncludeDirectories>.;..\zeranoe.com\dev\include</AdditionalIncludeDirectories>
    5456    </ClCompile>
    5557    <Link>
    5658      <SubSystem>Console</SubSystem>
    5759      <GenerateDebugInformation>true</GenerateDebugInformation>
    58       <AdditionalLibraryDirectories>
    59       </AdditionalLibraryDirectories>
     60      <AdditionalLibraryDirectories>.;..\zeranoe.com\dev\lib</AdditionalLibraryDirectories>
    6061    </Link>
    6162  </ItemDefinitionGroup>
     
    6970      <IntrinsicFunctions>true</IntrinsicFunctions>
    7071      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
    71       <AdditionalIncludeDirectories>.;.\dev\include</AdditionalIncludeDirectories>
     72      <AdditionalIncludeDirectories>.;..\zeranoe.com\dev\include</AdditionalIncludeDirectories>
    7273      <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>
    7374      <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
     
    8283      <EnableCOMDATFolding>true</EnableCOMDATFolding>
    8384      <OptimizeReferences>true</OptimizeReferences>
    84       <AdditionalLibraryDirectories>
    85       </AdditionalLibraryDirectories>
     85      <AdditionalLibraryDirectories>.;..\zeranoe.com\dev\lib</AdditionalLibraryDirectories>
    8686    </Link>
    8787  </ItemDefinitionGroup>
Note: See TracChangeset for help on using the changeset viewer.