Skip to content

Commit aa7e9ad

Browse files
committed
外部ライブラリをパッケージ外から呼び出すように修正
* exinc、exlibを削除 * libcob等のプロパティから環境変数LIB, INCLUDEを参照するように修正 TODO:ビルドは通るがVisual Studioで参照未解決エラーとなる * READMEを更新
1 parent 93125aa commit aa7e9ad

46 files changed

Lines changed: 104 additions & 3466 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

win32/cobc/cobc.vcxproj

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,25 +68,29 @@
6868
<PropertyGroup Label="UserMacros" />
6969
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7070
<LinkIncremental>true</LinkIncremental>
71-
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\lib;</IncludePath>
71+
<IncludePath>%INCLUDE%;%INCLUDE%;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\lib;</IncludePath>
7272
<OutDir>$(SolutionDir)\BIN\$(Platform)\$(Configuration)\</OutDir>
7373
<SourcePath>$(SolutionDir)..\cobc</SourcePath>
74+
<LibraryPath>%LIB%;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);</LibraryPath>
7475
</PropertyGroup>
7576
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7677
<LinkIncremental>true</LinkIncremental>
77-
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\lib;</IncludePath>
78+
<IncludePath>%INCLUDE%;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\lib;</IncludePath>
7879
<OutDir>$(SolutionDir)\BIN\$(Platform)\$(Configuration)\</OutDir>
80+
<LibraryPath>%LIB%;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);</LibraryPath>
7981
</PropertyGroup>
8082
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
8183
<LinkIncremental>false</LinkIncremental>
82-
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\lib;</IncludePath>
84+
<IncludePath>%INCLUDE%;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\lib;</IncludePath>
8385
<OutDir>$(SolutionDir)\BIN\$(Platform)\$(Configuration)\</OutDir>
8486
<SourcePath>$(SolutionDir)..\cobc</SourcePath>
87+
<LibraryPath>%LIB%;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);</LibraryPath>
8588
</PropertyGroup>
8689
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8790
<LinkIncremental>false</LinkIncremental>
88-
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\lib;</IncludePath>
91+
<IncludePath>%INCLUDE%;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir);$(SolutionDir)..;$(SolutionDir)..\lib;</IncludePath>
8992
<OutDir>$(SolutionDir)\BIN\$(Platform)\$(Configuration)\</OutDir>
93+
<LibraryPath>%LIB%;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);</LibraryPath>
9094
</PropertyGroup>
9195
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9296
<ClCompile>

win32/cobcrun/cobcrun.vcxproj

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,25 +68,29 @@
6868
<PropertyGroup Label="UserMacros" />
6969
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7070
<LinkIncremental>true</LinkIncremental>
71-
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir);$(SolutionDir)..;$(SolutionDir)../lib;</IncludePath>
71+
<IncludePath>%INCLUDE%;%INCLUDE%;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir);$(SolutionDir)..;$(SolutionDir)../lib;</IncludePath>
7272
<OutDir>$(SolutionDir)\BIN\$(Platform)\$(Configuration)\</OutDir>
7373
<SourcePath>$(SolutionDir)..\bin;$(SolutionDir)..\lib</SourcePath>
74+
<LibraryPath>%LIB%;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);</LibraryPath>
7475
</PropertyGroup>
7576
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7677
<LinkIncremental>true</LinkIncremental>
77-
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir);$(SolutionDir)..;$(SolutionDir)../lib;</IncludePath>
78+
<IncludePath>%INCLUDE%;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir);$(SolutionDir)..;$(SolutionDir)../lib;</IncludePath>
7879
<OutDir>$(SolutionDir)\BIN\$(Platform)\$(Configuration)\</OutDir>
80+
<LibraryPath>%LIB%;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);</LibraryPath>
7981
</PropertyGroup>
8082
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
8183
<LinkIncremental>false</LinkIncremental>
82-
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir);$(SolutionDir)..;$(SolutionDir)../lib;</IncludePath>
84+
<IncludePath>%INCLUDE%;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir);$(SolutionDir)..;$(SolutionDir)../lib;</IncludePath>
8385
<OutDir>$(SolutionDir)\BIN\$(Platform)\$(Configuration)\</OutDir>
8486
<SourcePath>$(SolutionDir)..\bin;$(SolutionDir)..\lib</SourcePath>
87+
<LibraryPath>%LIB%;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86);</LibraryPath>
8588
</PropertyGroup>
8689
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8790
<LinkIncremental>false</LinkIncremental>
88-
<IncludePath>$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir);$(SolutionDir)..;$(SolutionDir)../lib;</IncludePath>
91+
<IncludePath>%INCLUDE%;$(VC_IncludePath);$(WindowsSDK_IncludePath);$(SolutionDir);$(SolutionDir)..;$(SolutionDir)../lib;</IncludePath>
8992
<OutDir>$(SolutionDir)\BIN\$(Platform)\$(Configuration)\</OutDir>
93+
<LibraryPath>%LIB%;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64);</LibraryPath>
9094
</PropertyGroup>
9195
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
9296
<ClCompile>

0 commit comments

Comments
 (0)