|
29 | 29 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
30 | 30 | <ConfigurationType>Application</ConfigurationType>
|
31 | 31 | <UseDebugLibraries>true</UseDebugLibraries>
|
32 |
| - <PlatformToolset>v143</PlatformToolset> |
| 32 | + <PlatformToolset>ClangCL</PlatformToolset> |
33 | 33 | <CharacterSet>Unicode</CharacterSet>
|
34 | 34 | </PropertyGroup>
|
35 | 35 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
36 | 36 | <ConfigurationType>Application</ConfigurationType>
|
37 | 37 | <UseDebugLibraries>false</UseDebugLibraries>
|
38 |
| - <PlatformToolset>v143</PlatformToolset> |
| 38 | + <PlatformToolset>ClangCL</PlatformToolset> |
39 | 39 | <WholeProgramOptimization>true</WholeProgramOptimization>
|
40 | 40 | <CharacterSet>Unicode</CharacterSet>
|
41 | 41 | </PropertyGroup>
|
|
48 | 48 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
49 | 49 | <ConfigurationType>Application</ConfigurationType>
|
50 | 50 | <UseDebugLibraries>false</UseDebugLibraries>
|
51 |
| - <PlatformToolset>v143</PlatformToolset> |
| 51 | + <PlatformToolset>ClangCL</PlatformToolset> |
52 | 52 | <WholeProgramOptimization>true</WholeProgramOptimization>
|
53 | 53 | <CharacterSet>Unicode</CharacterSet>
|
54 | 54 | </PropertyGroup>
|
55 | 55 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
56 |
| - <PropertyGroup> |
57 |
| - <LinkToolExe>link.exe</LinkToolExe> |
58 |
| - </PropertyGroup> |
59 | 56 | <ImportGroup Label="ExtensionSettings">
|
60 | 57 | </ImportGroup>
|
61 | 58 | <ImportGroup Label="Shared">
|
|
75 | 72 | <PropertyGroup Label="UserMacros" />
|
76 | 73 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
77 | 74 | <LinkIncremental>true</LinkIncremental>
|
| 75 | + <IncludePath>C:\GNUstep\$(LibrariesArchitecture)\$(Configuration)\include;$(IncludePath)</IncludePath> |
| 76 | + <LibraryPath>C:\GNUstep\$(LibrariesArchitecture)\$(Configuration)\lib;$(LibraryPath)</LibraryPath> |
78 | 77 | </PropertyGroup>
|
79 | 78 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
80 | 79 | <LinkIncremental>false</LinkIncremental>
|
| 80 | + <IncludePath>C:\GNUstep\$(LibrariesArchitecture)\$(Configuration)\include;$(IncludePath)</IncludePath> |
| 81 | + <LibraryPath>C:\GNUstep\$(LibrariesArchitecture)\$(Configuration)\lib;$(LibraryPath)</LibraryPath> |
81 | 82 | </PropertyGroup>
|
82 | 83 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
83 | 84 | <LinkIncremental>true</LinkIncremental>
|
84 |
| - <IncludePath>C:\GNUstep\x64\Debug\include;$(VC_IncludePath);$(WindowsSDK_IncludePath);</IncludePath> |
85 |
| - <LibraryPath>C:\GNUstep\x64\Debug\lib;$(VC_LibraryPath_x64);$(WindowsSDK_LibraryPath_x64)</LibraryPath> |
| 85 | + <IncludePath>C:\GNUstep\$(LibrariesArchitecture)\$(Configuration)\include;$(IncludePath)</IncludePath> |
| 86 | + <LibraryPath>C:\GNUstep\$(LibrariesArchitecture)\$(Configuration)\lib;$(LibraryPath)</LibraryPath> |
86 | 87 | </PropertyGroup>
|
87 | 88 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
88 | 89 | <LinkIncremental>false</LinkIncremental>
|
| 90 | + <IncludePath>C:\GNUstep\$(LibrariesArchitecture)\$(Configuration)\include;$(IncludePath)</IncludePath> |
| 91 | + <LibraryPath>C:\GNUstep\$(LibrariesArchitecture)\$(Configuration)\lib;$(LibraryPath)</LibraryPath> |
89 | 92 | </PropertyGroup>
|
90 | 93 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
91 | 94 | <ClCompile>
|
92 | 95 | <WarningLevel>Level3</WarningLevel>
|
93 | 96 | <SDLCheck>true</SDLCheck>
|
94 |
| - <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 97 | + <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;GNUSTEP;GNUSTEP_WITH_DLL;GNUSTEP_RUNTIME=1;_NONFRAGILE_ABI=1;_NATIVE_OBJC_EXCEPTIONS;GSWARN;GSDIAGNOSE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
95 | 98 | <ConformanceMode>true</ConformanceMode>
|
| 99 | + <AdditionalOptions>-fobjc-runtime=gnustep-2.0 -Xclang -fexceptions -Xclang -fobjc-exceptions -fblocks -Xclang -fobjc-arc %(AdditionalOptions)</AdditionalOptions> |
96 | 100 | </ClCompile>
|
97 | 101 | <Link>
|
98 | 102 | <SubSystem>Windows</SubSystem>
|
99 | 103 | <GenerateDebugInformation>true</GenerateDebugInformation>
|
| 104 | + <AdditionalDependencies>gnustep-base.lib;objc.lib;%(AdditionalDependencies)</AdditionalDependencies> |
100 | 105 | </Link>
|
101 | 106 | </ItemDefinitionGroup>
|
102 | 107 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
105 | 110 | <FunctionLevelLinking>true</FunctionLevelLinking>
|
106 | 111 | <IntrinsicFunctions>true</IntrinsicFunctions>
|
107 | 112 | <SDLCheck>true</SDLCheck>
|
108 |
| - <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 113 | + <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;GNUSTEP;GNUSTEP_WITH_DLL;GNUSTEP_RUNTIME=1;_NONFRAGILE_ABI=1;_NATIVE_OBJC_EXCEPTIONS;GSWARN;GSDIAGNOSE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
109 | 114 | <ConformanceMode>true</ConformanceMode>
|
| 115 | + <AdditionalOptions>-fobjc-runtime=gnustep-2.0 -Xclang -fexceptions -Xclang -fobjc-exceptions -fblocks -Xclang -fobjc-arc %(AdditionalOptions)</AdditionalOptions> |
110 | 116 | </ClCompile>
|
111 | 117 | <Link>
|
112 | 118 | <SubSystem>Windows</SubSystem>
|
113 | 119 | <EnableCOMDATFolding>true</EnableCOMDATFolding>
|
114 | 120 | <OptimizeReferences>true</OptimizeReferences>
|
115 | 121 | <GenerateDebugInformation>true</GenerateDebugInformation>
|
| 122 | + <AdditionalDependencies>gnustep-base.lib;objc.lib;%(AdditionalDependencies)</AdditionalDependencies> |
116 | 123 | </Link>
|
117 | 124 | </ItemDefinitionGroup>
|
118 | 125 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
135 | 142 | <FunctionLevelLinking>true</FunctionLevelLinking>
|
136 | 143 | <IntrinsicFunctions>true</IntrinsicFunctions>
|
137 | 144 | <SDLCheck>true</SDLCheck>
|
138 |
| - <PreprocessorDefinitions>NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
| 145 | + <PreprocessorDefinitions>NDEBUG;_WINDOWS;GNUSTEP;GNUSTEP_WITH_DLL;GNUSTEP_RUNTIME=1;_NONFRAGILE_ABI=1;_NATIVE_OBJC_EXCEPTIONS;GSWARN;GSDIAGNOSE;%(PreprocessorDefinitions)</PreprocessorDefinitions> |
139 | 146 | <ConformanceMode>true</ConformanceMode>
|
| 147 | + <AdditionalOptions>-fobjc-runtime=gnustep-2.0 -Xclang -fexceptions -Xclang -fobjc-exceptions -fblocks -Xclang -fobjc-arc %(AdditionalOptions)</AdditionalOptions> |
140 | 148 | </ClCompile>
|
141 | 149 | <Link>
|
142 | 150 | <SubSystem>Windows</SubSystem>
|
143 | 151 | <EnableCOMDATFolding>true</EnableCOMDATFolding>
|
144 | 152 | <OptimizeReferences>true</OptimizeReferences>
|
145 | 153 | <GenerateDebugInformation>true</GenerateDebugInformation>
|
| 154 | + <AdditionalDependencies>gnustep-base.lib;objc.lib;dispatch.lib;%(AdditionalDependencies)</AdditionalDependencies> |
146 | 155 | </Link>
|
147 | 156 | </ItemDefinitionGroup>
|
148 | 157 | <ItemGroup>
|
|
155 | 164 | <ClCompile Include="ObjCWin32.mm">
|
156 | 165 | <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
157 | 166 | </CompileAs>
|
| 167 | + <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
| 168 | + </CompileAs> |
| 169 | + <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> |
| 170 | + </CompileAs> |
| 171 | + <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> |
| 172 | + </CompileAs> |
158 | 173 | </ClCompile>
|
159 | 174 | </ItemGroup>
|
160 | 175 | <ItemGroup>
|
|
168 | 183 | <ImportGroup Label="ExtensionTargets">
|
169 | 184 | </ImportGroup>
|
170 | 185 | <ItemGroup>
|
171 |
| - <Content Include="C:\GNUstep\x64\Debug\bin\*.dll"> |
| 186 | + <Content Include="C:\GNUstep\$(LibrariesArchitecture)\$(Configuration)\bin\*.dll"> |
172 | 187 | <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
173 | 188 | <TargetPath>%(Filename)%(Extension)</TargetPath>
|
174 | 189 | </Content>
|
|
0 commit comments