Skip to content

Commit

Permalink
Merge pull request #4 from MadhukarMoogala/ForAutoCAD2018
Browse files Browse the repository at this point in the history
Migrated to AutoCAD 2018
  • Loading branch information
cyrillef authored Aug 25, 2017
2 parents 109e738 + 34d475c commit fff8b96
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ build/
*.pidb
*.log
*.scc

*.VC.db
# Visual C++ cache files
ipch/
*.aps
Expand Down
10 changes: 5 additions & 5 deletions OPMNetExt/OPMNetExt.vcxproj
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
Expand Down Expand Up @@ -42,16 +42,16 @@
<WholeProgramOptimization>false</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<PlatformToolset>v110</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<PlatformToolset>v110</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<PlatformToolset>v110</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<PlatformToolset>v110</PlatformToolset>
<PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="PropertySheets">
Expand Down
Binary file modified OPMNetSample/asdkOPMNetExt.dll
Binary file not shown.
15 changes: 8 additions & 7 deletions OPMNetSample/asdkOPMNetSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>asdkOPMNetSample</RootNamespace>
<AssemblyName>asdkOPMNetSample</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
Expand All @@ -27,6 +27,7 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<Prefer32Bit>false</Prefer32Bit>
<PlatformTarget>x64</PlatformTarget>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
Expand All @@ -39,27 +40,27 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="AcCoreMgd">
<HintPath>..\..\..\Documents\__sdk\ARX-2016\inc\AcCoreMgd.dll</HintPath>
<HintPath>D:\ObjectARX 2018\inc\AcCoreMgd.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="AcCui">
<HintPath>..\..\..\Documents\__sdk\ARX-2016\inc\AcCui.dll</HintPath>
<HintPath>D:\ObjectARX 2018\inc\AcCui.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="AcDbMgd">
<HintPath>..\..\..\Documents\__sdk\ARX-2016\inc\AcDbMgd.dll</HintPath>
<HintPath>D:\ObjectARX 2018\inc\AcDbMgd.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="AcMgd">
<HintPath>..\..\..\Documents\__sdk\ARX-2016\inc\AcMgd.dll</HintPath>
<HintPath>D:\ObjectARX 2018\inc\AcMgd.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="AdWindows">
<HintPath>..\..\..\Documents\__sdk\ARX-2016\inc\AdWindows.dll</HintPath>
<HintPath>D:\ObjectARX 2018\inc\AdWindows.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="AdWindows">
<HintPath>..\..\..\Documents\__sdk\ARX-2016\inc\AcTcMgd.dll</HintPath>
<HintPath>D:\ObjectARX 2018\inc\AcTcMgd.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="System" />
Expand Down
Binary file modified OPMNetSample/asdkOPMNetSample.dll
Binary file not shown.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
# OPM.Net Extension

[![build status](https://img.shields.io/badge/build-passed-blue.svg)](https://github.com/cyrillef/OPMNetExt/tree/master/OPMNetSample)
[![ObjectARX](https://img.shields.io/badge/ObjectARX-2016-blue.svg)](http://usa.autodesk.com/adsk/servlet/index?siteID=123112&id=773204)
[![AutoCAD](https://img.shields.io/badge/AutoCAD-2016-green.svg)](http://www.autodesk.com/developautocad)
[![ObjectARX](https://img.shields.io/badge/ObjectARX-2018-blue.svg)](http://usa.autodesk.com/adsk/servlet/index?siteID=123112&id=773204)
[![AutoCAD](https://img.shields.io/badge/AutoCAD-2018-green.svg)](http://www.autodesk.com/developautocad)
![Platforms](https://img.shields.io/badge/platform-windows-lightgray.svg)
[![License](http://img.shields.io/:license-mit-blue.svg)](http://opensource.org/licenses/MIT)

Expand All @@ -29,8 +29,8 @@ functionality to .NET languages.

## Dependencies

* Visual Studio 2010
* ObjectARX and AutoCAD from 2010 to 2016
* Visual Studio 2015
* ObjectARX and AutoCAD 2018


## Setup/Usage Instructions
Expand Down
6 changes: 3 additions & 3 deletions arx-config.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<AcadDir Condition="'$(Platform)'=='x64'">C:\Program Files\Autodesk\AutoCAD 2016\</AcadDir>
<AcadExe Condition="'$(ArxAppType)'=='dbx' or '$(ArxAppType)'=='dbxnet' or '$(ArxAppType)'=='arx' or '$(ArxAppType)'=='arxnet'">acad.exe</AcadExe>
<AcadExe Condition="'$(ArxAppType)'=='crx' or '$(ArxAppType)'=='crxnet'">accoreconsole.exe</AcadExe>
<ArxSdkDir>z:\Documents\__sdk\ARX-2016\</ArxSdkDir>
<ArxSdkDir>D:\ObjectARX 2018</ArxSdkDir>

<ArxSdkIncs Condition="'$(Platform)'=='Win32'">$(ArxSdkDir)\inc;$(ArxSdkDir)\inc-win32</ArxSdkIncs>
<ArxSdkIncs Condition="'$(Platform)'=='x64'">$(ArxSdkDir)\inc;$(ArxSdkDir)\inc-x64</ArxSdkIncs>
Expand All @@ -27,8 +27,8 @@
<ArxAmodelerLibs>$(ArxSdkDir)\utils\amodeler\lib-$(Platform)</ArxAmodelerLibs>
<ArxBrepLibs>$(ArxSdkDir)\utils\brep\lib-$(Platform)</ArxBrepLibs>
<ArxAtilLibs>$(ArxSdkDir)\utils\Atil\Lib-$(Platform)</ArxAtilLibs>
<ArxSDKVersion>20.0</ArxSDKVersion>
<ArxSDKPlatform>v110</ArxSDKPlatform>
<ArxSDKVersion>22.0</ArxSDKVersion>
<ArxSDKPlatform>v140</ArxSDKPlatform>
</PropertyGroup>

<ImportGroup Label="PropertySheets">
Expand Down

0 comments on commit fff8b96

Please sign in to comment.