Skip to content

Commit

Permalink
- update the Visual Studio projects to VS2010
Browse files Browse the repository at this point in the history
- it seems vcproj has a vcxproj counterpart and there are some other new files too
- renamed ext.exe and ext.pdb to OMPlotWindow.exe and OMPlotWindow.pdb
- rebuild all Qt clients: OMShell, OMNotebook, OMPlotWindow


git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@5740 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
adrpo committed Jun 29, 2010
1 parent 4608754 commit 3620f28
Show file tree
Hide file tree
Showing 14 changed files with 2,208 additions and 68 deletions.
100 changes: 100 additions & 0 deletions OMNotebook/3Dpkg/3Dpkg.vcxproj
@@ -0,0 +1,100 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{286F13C0-0E92-4179-A57E-E8C949054F46}</ProjectGuid>
<RootNamespace>My3Dpkg</RootNamespace>
<Keyword>ManagedCProj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
<CLRSupport>false</CLRSupport>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
<CLRSupport>false</CLRSupport>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(Configuration)\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)$(Configuration)\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(COINDIR)\include\;.;Debug;$(QTHOME)\mkspecs\win32-msvc2008;$(QTHOME)\include\QtGui;$(QTHOME)\include\QtCore;$(QTHOME)\include\QtNetwork;$(QTHOME)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;UNICODE;QT_LARGEFILE_SUPPORT;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_THREAD_SUPPORT;SOQT_DLL;COIN_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(COINDIR)\include\;.;Release;$(QTHOME)\mkspecs\win32-msvc2008;$(QTHOME)\include\;$(QTHOME)\include\QtGui;$(QTHOME)\include\QtCore;$(QTHOME)\include\QtNetwork;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;UNICODE;QT_LARGEFILE_SUPPORT;QT_DLL;QT_GUI_LIB;QT_CORE_LIB;QT_NO_DEBUG;QT_THREAD_SUPPORT;SOQT_DLL;COIN_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)$(ProjectName).lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="Debug\moc_VisualizationWidget.cpp" />
<ClCompile Include="SimulationData.cpp" />
<ClCompile Include="VisualizationWidget.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="SimulationData.h" />
<CustomBuild Include="VisualizationWidget.h">
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%QTHOME%\bin\moc.exe -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I "%QTHOME%\include\QtCore" -I "%QTHOME%\include\QtCore" -I "%QTHOME%\include\QtGui" -I "%QTHOME%\include\QtGui" -I "%QTHOME%\include" -I "." -I "%QTHOME%\include\ActiveQt" -I "debug" -I "." -I"%QTHOME%\mkspecs\win32-msvc2008" VisualizationWidget.h -o debug\moc_VisualizationWidget.cpp
</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">%QTHOME%\bin\moc.exe;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">debug\moc_VisualizationWidget.cpp;%(Outputs)</Outputs>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%QTHOME%\bin\moc.exe -DNDEBUG, -DSOQT_DLL -DCOIN_DLL -DQT_NO_DEBUG -D_WINDOWS -DUNICODE -DQT_LARGEFILE_SUPPORT -DWIN32 -DQT_DLL -DQT_GUI_LIB -DQT_CORE_LIB -DQT_THREAD_SUPPORT -I "%QTHOME%\include\QtCore" -I "%QTHOME%\include\QtCore" -I "%QTHOME%\include\QtGui" -I "%QTHOME%\include\QtGui" -I "%QTHOME%\include" -I "." -I "%QTHOME%\include\ActiveQt" -I "debug" -I "." -I"%QTHOME%\mkspecs\win32-msvc2008" VisualizationWidget.h -o debug\moc_VisualizationWidget.cpp
</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%QTHOME%\bin\moc.exe;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">debug\moc_VisualizationWidget.cpp;%(Outputs)</Outputs>
</CustomBuild>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
34 changes: 34 additions & 0 deletions OMNotebook/3Dpkg/3Dpkg.vcxproj.filters
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Header Files">
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
<Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="Debug\moc_VisualizationWidget.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="SimulationData.cpp">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="VisualizationWidget.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="SimulationData.h">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<CustomBuild Include="VisualizationWidget.h">
<Filter>Header Files</Filter>
</CustomBuild>
</ItemGroup>
</Project>
138 changes: 138 additions & 0 deletions OMNotebook/NotebookParser/NotebookParser.vcxproj
@@ -0,0 +1,138 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
<ProjectConfiguration Include="Release|Win32">
<Configuration>Release</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{3700A59E-E33B-4AC7-8385-35D486AEE4E0}</ProjectGuid>
<RootNamespace>NotebookParser</RootNamespace>
<Keyword>Win32Proj</Keyword>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>NotSet</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="$(VCTargetsPath)Microsoft.CPP.UpgradeFromVC71.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Debug\</IntDir>
<OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</OutDir>
<IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Release\</IntDir>
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
<CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
<CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(QNBHOME)\OMNotebookQT4;$(QTHOME)\include;$(QTHOME)\include\QtCore;$(OMDEV)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;UNICODE;QT_LARGEFILE_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>EditAndContinue</DebugInformationFormat>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)NotebookParser.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<WholeProgramOptimization>true</WholeProgramOptimization>
<AdditionalIncludeDirectories>$(QNBHOME)\OMNotebookQT4;$(QTHOME)\include;$(QTHOME)\include\QtCore;$(OMDEV)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<BasicRuntimeChecks>Default</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4311; 4312;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Lib>
<OutputFile>$(OutDir)NotebookParser.lib</OutputFile>
</Lib>
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="AntlrNotebookLexer.cpp" />
<ClCompile Include="AntlrNotebookParser.cpp" />
<ClCompile Include="AntlrNotebookTreeParser.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="AntlrNotebookLexer.hpp" />
<ClInclude Include="AntlrNotebookParser.hpp" />
<ClInclude Include="AntlrNotebookParserTokenTypes.hpp" />
<ClInclude Include="AntlrNotebookTreeParser.hpp" />
<ClInclude Include="AntlrNotebookTreeParserTokenTypes.hpp" />
<ClInclude Include="notebookgrammarTokenTypes.hpp" />
</ItemGroup>
<ItemGroup>
<CustomBuild Include="lexer.g">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Performing custom build for Lexer</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">java -cp $(OMDev)\bin\antlr\antlr.jar antlr.Tool %(Filename).g
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AntlrNotebookLexer.hpp;AntlrNotebookLexer.cpp;notebookgrammarTokenTypes.hpp;notebookgrammarTokenTypes.txt;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Performing custom build for Lexer</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">java -cp $(OMDev)\bin\antlr\antlr.jar antlr.Tool %(Filename).g
</Command>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AntlrNotebookLexer.hpp;AntlrNotebookLexer.cpp;notebookgrammarTokenTypes.hpp;notebookgrammarTokenTypes.txt;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="parser.g">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Performing Custom Build Step for Parser</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">java -cp $(OMDev)\bin\antlr\antlr.jar antlr.Tool %(Filename).g
</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">notebookgrammarTokenTypes.txt;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AntlrNotebookParser.hpp;AntlrNotebookParser.cpp;AntlrNotebookParserTokenTypes.hpp;AntlrNotebookParserTokenTypes.txt;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Performing Custom Build Step for Parser</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">java -cp $(OMDev)\bin\antlr\antlr.jar antlr.Tool %(Filename).g
</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">notebookgrammarTokenTypes.txt;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AntlrNotebookParser.hpp;AntlrNotebookParser.cpp;AntlrNotebookParserTokenTypes.hpp;AntlrNotebookParserTokenTypes.txt;%(Outputs)</Outputs>
</CustomBuild>
<CustomBuild Include="walker.g">
<Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Performing Custom Build Step walker</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">java -cp $(OMDev)\bin\antlr\antlr.jar antlr.Tool %(Filename).g
</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AntlrNotebookParserTokenTypes.txt;notebookgrammarTokenTypes.txt;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AntlrNotebookTreeParser.cpp;AntlrNotebookTreeParser.hpp;AntlrNotebookTreeParserTokenTypes.hpp;AntlrNotebookTreeParserTokenTypes.txt;%(Outputs)</Outputs>
<Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Performing Custom Build Step walker</Message>
<Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">java -cp $(OMDev)\bin\antlr\antlr.jar antlr.Tool %(Filename).g
</Command>
<AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AntlrNotebookParserTokenTypes.txt;notebookgrammarTokenTypes.txt;%(AdditionalInputs)</AdditionalInputs>
<Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AntlrNotebookTreeParser.cpp;AntlrNotebookTreeParser.hpp;AntlrNotebookTreeParserTokenTypes.hpp;AntlrNotebookTreeParserTokenTypes.txt;%(Outputs)</Outputs>
</CustomBuild>
<None Include="ReadMe.txt" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>

0 comments on commit 3620f28

Please sign in to comment.