pastebin - collaborative debugging tool
nrubsig.kpaste.net RSS

Difference between
modified post 1d6a by Anonymous on Sat 6th Sep 2025 14:38
original post aa470108c by Anonymous on Thu 4th Sep 2025 21:19
Download diff
Show old version | new version | both versions

    
1-
diff --git a/build.vc19/nfs41_np/nfs41_np.vcxproj b/build.vc19/nfs41_np/nfs41_np.vcxproj
1+
diff --git a/cygwin/Makefile b/cygwin/Makefile
2-
index e922c2e..b2eb0f9 100644
2+
index de3ad27..72af9bf 100644
3-
--- a/build.vc19/nfs41_np/nfs41_np.vcxproj
3+
--- a/cygwin/Makefile
4-
+++ b/build.vc19/nfs41_np/nfs41_np.vcxproj
4+
+++ b/cygwin/Makefile
5-
@@ -132,7 +132,7 @@
5+
@@ -14,7 +14,7 @@ PROJECT_BASEDIR_DIR := $(shell dirname $(realpath $(CYGWIN_MAKEFILE_DIR)/))
6-
       <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6+
 DESTDIR:=$(PROJECT_BASEDIR_DIR)/destdir
7-
       <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
7+
8-
       <LanguageStandard_C>stdc17</LanguageStandard_C>
8+
 VS_BUILD_DIR32:=$(PROJECT_BASEDIR_DIR)/build.vc19/Debug/
9-
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
9+
-VS_BUILD_DIR64:=$(PROJECT_BASEDIR_DIR)/build.vc19/x64/Debug/
10-
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
10+
+VS_BUILD_DIR64:=$(PROJECT_BASEDIR_DIR)/build.vc19/ARM64/Debug/
11-
       <AdditionalOptions>/wd4100 /wd5105</AdditionalOptions>
11+
 #VS_BUILD_DIR32:=$(PROJECT_BASEDIR_DIR)/build.vc19/Release/
12-
       <SupportJustMyCode>false</SupportJustMyCode>
12+
 #VS_BUILD_DIR64:=$(PROJECT_BASEDIR_DIR)/build.vc19/x64/Release/
13-
       <IntrinsicFunctions>true</IntrinsicFunctions>
13+
14-
@@ -153,7 +153,7 @@
14+
diff --git a/cygwin/Makefile.install b/cygwin/Makefile.install
15-
       <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
15+
index e9f68df..60dcb6a 100644
16-
       <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
16+
--- a/cygwin/Makefile.install
17-
       <LanguageStandard_C>stdc17</LanguageStandard_C>
17+
+++ b/cygwin/Makefile.install
18-
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
18+
@@ -181,9 +181,9 @@ installdest:
19-
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
19+
 	test -d "$${vsbasepath}" || { printf "vsbasepath not found\n" 1>&2 ; exit 1 ; }; \
20-
       <AdditionalOptions>/wd4100 /wd5105</AdditionalOptions>
20+
 	if [[ "$(CYGWIN_BASEPATH)" == *64* ]] ; then \
21-
       <SupportJustMyCode>false</SupportJustMyCode>
21+
 		cp \
22-
       <IntrinsicFunctions>true</IntrinsicFunctions>
22+
-			"$$(find "$${vsbasepath}/Community" -ipath '*/x64/*/VCRUNTIME140D.dll' | sort -n -r | head -n 1)" \
23-
@@ -174,7 +174,7 @@
23+
+			"$$(find "$${vsbasepath}/Community" -ipath '*/arm64/*/VCRUNTIME140D.dll' | sort -n -r | head -n 1)" \
24-
       <PreprocessorDefinitions>WIN32;_CRT_STDIO_ISO_WIDE_SPECIFIERS=1;UNICODE;_UNICODE;_DEBUG;_WINDOWS;_USRDLL;NFS41_NP_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
24+
 			$(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. ; \
25-
       <AdditionalIncludeDirectories>..\..\include;..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
25+
-		cp '/cygdrive/c/Program Files (x86)/Windows Kits/10/bin/x64/ucrt/ucrtbased.dll' $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. ; \
26-
       <LanguageStandard_C>stdc17</LanguageStandard_C>
26+
+		cp '/cygdrive/c/Program Files (x86)/Windows Kits/10/bin/arm64/ucrt/ucrtbased.dll' $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. ; \
27-
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
27+
 	else \
28-
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
28+
 		cp \
29-
       <AdditionalOptions>/wd4100 /wd5105</AdditionalOptions>
29+
 			"$$(find "$${vsbasepath}/Community" -ipath '*/x86/*/VCRUNTIME140D.dll' | sort -n -r | head -n 1)" \
30-
       <SupportJustMyCode>false</SupportJustMyCode>
30+
31-
       <IntrinsicFunctions>true</IntrinsicFunctions>
31+
32-
diff --git a/cygwin/Makefile b/cygwin/Makefile
32+
33-
index de3ad27..72af9bf 100644
33+
34-
--- a/cygwin/Makefile
34+
35-
+++ b/cygwin/Makefile
35+
36-
@@ -14,7 +14,7 @@ PROJECT_BASEDIR_DIR := $(shell dirname $(realpath $(CYGWIN_MAKEFILE_DIR)/))
36+
37-
 DESTDIR:=$(PROJECT_BASEDIR_DIR)/destdir
37+
3838
39-
 VS_BUILD_DIR32:=$(PROJECT_BASEDIR_DIR)/build.vc19/Debug/
39+
40-
-VS_BUILD_DIR64:=$(PROJECT_BASEDIR_DIR)/build.vc19/x64/Debug/
40+
41-
+VS_BUILD_DIR64:=$(PROJECT_BASEDIR_DIR)/build.vc19/ARM64/Debug/
41+
42-
 #VS_BUILD_DIR32:=$(PROJECT_BASEDIR_DIR)/build.vc19/Release/
42+
43-
 #VS_BUILD_DIR64:=$(PROJECT_BASEDIR_DIR)/build.vc19/x64/Release/
43+
4444
45-
diff --git a/cygwin/Makefile.install b/cygwin/Makefile.install
45+
46-
index e9f68df..60dcb6a 100644
46+
47-
--- a/cygwin/Makefile.install
47+
48-
+++ b/cygwin/Makefile.install
48+
49-
@@ -181,9 +181,9 @@ installdest:
49+
50-
 	test -d "$${vsbasepath}" || { printf "vsbasepath not found\n" 1>&2 ; exit 1 ; }; \
50+
51-
 	if [[ "$(CYGWIN_BASEPATH)" == *64* ]] ; then \
51+
52-
 		cp \
52+
53-
-			"$$(find "$${vsbasepath}/Community" -ipath '*/x64/*/VCRUNTIME140D.dll' | sort -n -r | head -n 1)" \
53+
54-
+			"$$(find "$${vsbasepath}/Community" -ipath '*/arm64/*/VCRUNTIME140D.dll' | sort -n -r | head -n 1)" \
54+
55-
 			$(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. ; \
55+
56-
-		cp '/cygdrive/c/Program Files (x86)/Windows Kits/10/bin/x64/ucrt/ucrtbased.dll' $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. ; \
56+
57-
+		cp '/cygdrive/c/Program Files (x86)/Windows Kits/10/bin/arm64/ucrt/ucrtbased.dll' $(DESTDIR)/$(CYGWIN_BASEPATH)/sbin/. ; \
57+
58-
 	else \
58+
59-
 		cp \
59+
60-
 			"$$(find "$${vsbasepath}/Community" -ipath '*/x86/*/VCRUNTIME140D.dll' | sort -n -r | head -n 1)" \
60+
6161

Submit a correction or amendment below (click here to make a fresh posting)
After submitting an amendment, you'll be able to view the differences between the old and new posts easily.

Syntax highlighting:

To highlight particular lines, prefix each line with {%HIGHLIGHT}




All content is user-submitted.
The administrators of this site (kpaste.net) are not responsible for their content.
Abuse reports should be emailed to us at