X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.pythonlink.win32.x86_64%2F.cproject;h=da57fee23c69f38737377eae52a424711c90f123;hb=d556dfd2739c43551c894dd636bf8e0735fbad55;hp=86dd82593f1ec217e4c89706c3d76da5b1ff6ade;hpb=c8a7033eeec2a8a4dd99a8738a7685e8d51b19fd;p=simantics%2Fpython.git

diff --git a/org.simantics.pythonlink.win32.x86_64/.cproject b/org.simantics.pythonlink.win32.x86_64/.cproject
index 86dd825..da57fee 100644
--- a/org.simantics.pythonlink.win32.x86_64/.cproject
+++ b/org.simantics.pythonlink.win32.x86_64/.cproject
@@ -3,9 +3,6 @@
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
 		<cconfiguration id="org.eclipse.cdt.msvc.dll.debug.242740231">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.eclipse.cdt.msvc.dll.debug.242740231" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-				<macros>
-					<stringMacro name="PythonDir" type="VALUE_TEXT" value="C:\Program Files\Python35"/>
-				</macros>
 				<externalSettings>
 					<externalSetting>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/org.simantics.pythonlink.win32.x86_64"/>
@@ -14,7 +11,7 @@
 					</externalSetting>
 				</externalSettings>
 				<extensions>
-					<extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/>
+					<extension id="org.eclipse.cdt.core.PE64" point="org.eclipse.cdt.core.BinaryParser"/>
 					<extension id="org.eclipse.cdt.core.VCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
@@ -25,11 +22,12 @@
 							<targetPlatform id="org.eclipse.cdt.msvc.targetPlatform.dll.debug.74329771" superClass="org.eclipse.cdt.msvc.targetPlatform.dll.debug"/>
 							<builder buildPath="${workspace_loc:/org.simantics.pythonlink.win32.x86_64}/Debug" id="org.eclipse.cdt.msvc.builder.1032433648" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="CDT Internal Builder" superClass="org.eclipse.cdt.msvc.builder"/>
 							<tool id="org.eclipse.cdt.msvc.cl.c.dll.debug.1244459782" name="C Compiler (cl)" superClass="org.eclipse.cdt.msvc.cl.c.dll.debug">
-								<option id="org.eclipse.cdt.msvc.cl.option.optimization.832991816" name="Optimization" superClass="org.eclipse.cdt.msvc.cl.option.optimization" value="org.eclipse.cdt.msvc.cl.option.optimization.default" valueType="enumerated"/>
-								<option id="org.eclipse.cdt.msvc.cl.option.debugFormat.994808880" name="Debug Information Format" superClass="org.eclipse.cdt.msvc.cl.option.debugFormat" value="org.eclipse.cdt.msvc.cl.option.debugFormat.complete" valueType="enumerated"/>
-								<option id="org.eclipse.cdt.msvc.cl.option.includes.1213511673" name="Include Path (/I)" superClass="org.eclipse.cdt.msvc.cl.option.includes" valueType="includePath">
+								<option id="org.eclipse.cdt.msvc.cl.option.optimization.832991816" name="Optimization" superClass="org.eclipse.cdt.msvc.cl.option.optimization" useByScannerDiscovery="false" value="org.eclipse.cdt.msvc.cl.option.optimization.default" valueType="enumerated"/>
+								<option id="org.eclipse.cdt.msvc.cl.option.debugFormat.994808880" name="Debug Information Format" superClass="org.eclipse.cdt.msvc.cl.option.debugFormat" useByScannerDiscovery="false" value="org.eclipse.cdt.msvc.cl.option.debugFormat.complete" valueType="enumerated"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="org.eclipse.cdt.msvc.cl.option.includes.1213511673" name="Include Path (/I)" superClass="org.eclipse.cdt.msvc.cl.option.includes" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/src&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\SDK\ScopeCppSDK\SDK\include\ucrt&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${SDKDir}\include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${PythonDir}\include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${PythonDir}\Lib\site-packages\numpy\core\include&quot;"/>
 								</option>
@@ -43,14 +41,13 @@
 								<inputType id="org.eclipse.cdt.msvc.rc.inputType.1260621447" superClass="org.eclipse.cdt.msvc.rc.inputType"/>
 							</tool>
 							<tool id="org.eclipse.cdt.msvc.link.dll.debug.590693911" name="Linker (link)" superClass="org.eclipse.cdt.msvc.link.dll.debug">
-								<option defaultValue="true" id="org.eclipse.cdt.msvc.link.option.dll.981503272" name="Build a DLL" superClass="org.eclipse.cdt.msvc.link.option.dll" valueType="boolean"/>
-								<option id="org.eclipse.cdt.msvc.link.option.debug.1991298239" name="Generate Debug Info (/debug)" superClass="org.eclipse.cdt.msvc.link.option.debug" value="true" valueType="boolean"/>
-								<option id="org.eclipse.cdt.msvc.link.option.libraries.6975129" name="Libraries" superClass="org.eclipse.cdt.msvc.link.option.libraries" valueType="libs">
-									<listOptionValue builtIn="false" value="python35.lib"/>
+								<option defaultValue="true" id="org.eclipse.cdt.msvc.link.option.dll.981503272" name="Build a DLL" superClass="org.eclipse.cdt.msvc.link.option.dll" useByScannerDiscovery="false" valueType="boolean"/>
+								<option id="org.eclipse.cdt.msvc.link.option.debug.1991298239" name="Generate Debug Info (/debug)" superClass="org.eclipse.cdt.msvc.link.option.debug" useByScannerDiscovery="false" value="true" valueType="boolean"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="org.eclipse.cdt.msvc.link.option.libraries.6975129" name="Libraries" superClass="org.eclipse.cdt.msvc.link.option.libraries" useByScannerDiscovery="false" valueType="libs">
+									<listOptionValue builtIn="false" value="python3.lib"/>
 								</option>
-								<option id="org.eclipse.cdt.msvc.link.option.libpath.31051683" name="Additional Libpath (/libpath)" superClass="org.eclipse.cdt.msvc.link.option.libpath" valueType="stringList">
-									<listOptionValue builtIn="false" value="&quot;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\lib\amd64&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Lib\x64&quot;"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="org.eclipse.cdt.msvc.link.option.libpath.31051683" name="Additional Libpath (/libpath)" superClass="org.eclipse.cdt.msvc.link.option.libpath" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="&quot;${SDKDir}\Lib\x64&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${PythonDir}\libs&quot;"/>
 								</option>
 								<inputType id="org.eclipse.cdt.msvc.link.inputType.967641183" superClass="org.eclipse.cdt.msvc.link.inputType"/>
@@ -67,9 +64,6 @@
 		</cconfiguration>
 		<cconfiguration id="org.eclipse.cdt.msvc.dll.release.1333930985">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="org.eclipse.cdt.msvc.dll.release.1333930985" moduleId="org.eclipse.cdt.core.settings" name="Release">
-				<macros>
-					<stringMacro name="PythonDir" type="VALUE_TEXT" value="C:\Program Files\Python35"/>
-				</macros>
 				<externalSettings>
 					<externalSetting>
 						<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/org.simantics.pythonlink.win32.x86_64"/>
@@ -91,9 +85,12 @@
 							<tool command="cl /c" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.VCErrorParser" id="org.eclipse.cdt.msvc.cl.c.dll.release.1838719247" name="C Compiler (cl)" superClass="org.eclipse.cdt.msvc.cl.c.dll.release">
 								<option id="org.eclipse.cdt.msvc.cl.option.optimization.1823239110" name="Optimization" superClass="org.eclipse.cdt.msvc.cl.option.optimization"/>
 								<option id="org.eclipse.cdt.msvc.cl.option.debugFormat.884112335" name="Debug Information Format" superClass="org.eclipse.cdt.msvc.cl.option.debugFormat"/>
-								<option id="org.eclipse.cdt.msvc.cl.option.includes.950193253" name="Include Path (/I)" superClass="org.eclipse.cdt.msvc.cl.option.includes" valueType="includePath">
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="org.eclipse.cdt.msvc.cl.option.includes.950193253" name="Include Path (/I)" superClass="org.eclipse.cdt.msvc.cl.option.includes" useByScannerDiscovery="false" valueType="includePath">
 									<listOptionValue builtIn="false" value="&quot;${ProjDirPath}/src&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Include&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;C:\Program Files (x86)\Windows Kits\10\Include\10.0.18362.0\um&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;C:\Program Files (x86)\Windows Kits\10\Include\10.0.18362.0\ucrt&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;C:\Program Files (x86)\Windows Kits\10\Include\10.0.18362.0\shared&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${VCIncludeDir}&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${PythonDir}\include&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${PythonDir}\Lib\site-packages\numpy\core\include&quot;"/>
 								</option>
@@ -109,12 +106,13 @@
 							</tool>
 							<tool command="link" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG}${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.VCErrorParser" id="org.eclipse.cdt.msvc.link.dll.release.1649900997" name="Linker (link)" superClass="org.eclipse.cdt.msvc.link.dll.release">
 								<option defaultValue="true" id="org.eclipse.cdt.msvc.link.option.dll.1543859943" name="Build a DLL" superClass="org.eclipse.cdt.msvc.link.option.dll" valueType="boolean"/>
-								<option id="org.eclipse.cdt.msvc.link.option.libraries.1810304708" name="Libraries" superClass="org.eclipse.cdt.msvc.link.option.libraries" valueType="libs">
-									<listOptionValue builtIn="false" value="python35.lib"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="org.eclipse.cdt.msvc.link.option.libraries.1810304708" name="Libraries" superClass="org.eclipse.cdt.msvc.link.option.libraries" useByScannerDiscovery="false" valueType="libs">
+									<listOptionValue builtIn="false" value="python3.lib"/>
 								</option>
-								<option id="org.eclipse.cdt.msvc.link.option.libpath.1055341457" name="Additional Libpath (/libpath)" superClass="org.eclipse.cdt.msvc.link.option.libpath" valueType="stringList">
-									<listOptionValue builtIn="false" value="&quot;C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\lib\amd64&quot;"/>
-									<listOptionValue builtIn="false" value="&quot;C:\Program Files (x86)\Microsoft SDKs\Windows\v7.0A\Lib\x64&quot;"/>
+								<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="org.eclipse.cdt.msvc.link.option.libpath.1055341457" name="Additional Libpath (/libpath)" superClass="org.eclipse.cdt.msvc.link.option.libpath" useByScannerDiscovery="false" valueType="stringList">
+									<listOptionValue builtIn="false" value="&quot;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.18362.0\um\x64&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.18362.0\ucrt\x64&quot;"/>
+									<listOptionValue builtIn="false" value="&quot;${VCDir}\lib\amd64&quot;"/>
 									<listOptionValue builtIn="false" value="&quot;${PythonDir}\libs&quot;"/>
 								</option>
 								<inputType id="org.eclipse.cdt.msvc.link.inputType.553501760" superClass="org.eclipse.cdt.msvc.link.inputType"/>