Skip to content
Snippets Groups Projects
Commit 0f906f8e authored by aacuevas's avatar aacuevas
Browse files

Updated jucer project with vs2012 needed options

parent 9868495e
Branches url-parsing
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
.gitignore
+ 13
− 2
View file @ 0f906f8e
......@@ -11,8 +11,8 @@ Introjucer/Builds/Linux/build
Introjucer/Builds/VisualStudio2010/Debug
Introjucer/Builds/VisualStudio2010/Release
Introjucer/Builds/VisualStudio2010/*.user
Introjucer/Builds/VisualStudio2010/The Jucer.sdf
Introjucer/Builds/VisualStudio2010/The Jucer.v11.suo
Introjucer/Builds/VisualStudio2010/*.sdf
Introjucer/Builds/VisualStudio2010/*.suo
# 3. extra files
Builds/Linux/build/data
......@@ -35,6 +35,17 @@ Builds/VisualStudio2012/open-ephys.vcxproj.user
Builds/VisualStudio2012/windowState.xml
Builds/VisualStudio2012/pipetest.bit
Builds/VisualStudio2010/Debug
Builds/VisualStudio2010/Release
Builds/VisualStudio2010/ipch
Builds/VisualStudio2010/open-ephys.sdf
Builds/VisualStudio2010/open-ephys.opensdf
Builds/VisualStudio2010/open-ephys.suo
Builds/VisualStudio2010/open-ephys.v11.suo
Builds/VisualStudio2010/open-ephys.vcxproj.user
Builds/VisualStudio2010/windowState.xml
Builds/VisualStudio2010/pipetest.bit
# 5. Miscellanous generated files (Doxygen, etc.)
Source/Docs/*
......
Builds/MacOSX/open-ephys.xcodeproj/project.pbxproj
+ 2811
− 3682
View file @ 0f906f8e
This diff is collapsed.
Builds/VisualStudio2012/open-ephys.vcxproj
+ 18
− 6
View file @ 0f906f8e
......@@ -40,12 +40,14 @@
</PropertyGroup>
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\</OutDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">.\Debug\bin\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">open-ephys</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</GenerateManifest>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\</OutDir>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(LibraryPath);..\..\windeps\lib</LibraryPath>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\Release\bin\</OutDir>
<TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">open-ephys</TargetName>
<GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</GenerateManifest>
<LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(LibraryPath);..\..\windeps\lib</LibraryPath>
<PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
......@@ -59,8 +61,8 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\windeps\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
......@@ -83,12 +85,17 @@
<SubSystem>Windows</SubSystem>
<TargetMachine>MachineX86</TargetMachine>
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
<AdditionalLibraryDirectories>..\..\windeps\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<LargeAddressAware>true</LargeAddressAware>
<AdditionalDependencies>setupapi.lib;opengl32.lib;glu32.lib;ftgl.lib;libftdi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\open-ephys.bsc</OutputFile>
</Bscmake>
<PostBuildEvent>
<Command>copy ..\..\windeps\dll\* .\Debug\bin\</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<Midl>
......@@ -100,8 +107,8 @@
</Midl>
<ClCompile>
<Optimization>MinSpace</Optimization>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>..\..\JuceLibraryCode;..\..\windeps\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;NOMINMAX;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader/>
......@@ -125,12 +132,17 @@
<TargetMachine>MachineX86</TargetMachine>
<OptimizeReferences>true</OptimizeReferences>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<AdditionalLibraryDirectories>..\..\windeps\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<LargeAddressAware>true</LargeAddressAware>
<AdditionalDependencies>setupapi.lib;opengl32.lib;glu32.lib;ftgl.lib;libftdi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<Bscmake>
<SuppressStartupBanner>true</SuppressStartupBanner>
<OutputFile>$(IntDir)\open-ephys.bsc</OutputFile>
</Bscmake>
<PostBuildEvent>
<Command>copy ..\..\windeps\dll\* .\Release\bin\</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\..\Source\AccessClass.cpp"/>
......
JuceLibraryCode/BinaryData.cpp
+ 122
− 122
View file @ 0f906f8e
This diff is collapsed.
open-ephys.jucer
+ 8
− 3
View file @ 0f906f8e
......@@ -39,12 +39,17 @@
winWarningLevel="4" generateManifest="1" winArchitecture="32-bit"/>
</CONFIGURATIONS>
</VS2010>
<VS2012 targetFolder="Builds/VisualStudio2012" libraryType="1" juceFolder="JuceLibraryCode/modules">
<VS2012 targetFolder="Builds/VisualStudio2012" libraryType="1" juceFolder="JuceLibraryCode/modules"
extraDefs="NOMINMAX&#10;" externalLibraries="setupapi.lib&#10;opengl32.lib&#10;glu32.lib&#10;ftgl.lib&#10;libftdi.lib">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" winWarningLevel="4" generateManifest="1" winArchitecture="32-bit"
isDebug="1" optimisation="1" targetName="open-ephys"/>
isDebug="1" optimisation="1" targetName="open-ephys" libraryPath="..\..\windeps\lib&#10;"
headerPath="..\..\windeps\include" postbuildCommand="copy ..\..\windeps\dll\* .\Debug\bin\"
binaryPath="Builds\VisualStudio2012\Debug\bin"/>
<CONFIGURATION name="Release" winWarningLevel="4" generateManifest="1" winArchitecture="32-bit"
isDebug="0" optimisation="2" targetName="open-ephys"/>
isDebug="0" optimisation="2" targetName="open-ephys" binaryPath="Builds\VisualStudio2012\Release\bin"
headerPath="..\..\windeps\include" libraryPath="..\..\windeps\lib&#10;"
postbuildCommand="copy ..\..\windeps\dll\* .\Release\bin\"/>
</CONFIGURATIONS>
</VS2012>
</EXPORTFORMATS>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment