diff --git a/src/sbbs3/ftpsrvr.vcxproj b/src/sbbs3/ftpsrvr.vcxproj
index bf0edb798b52358070379a653aa646b61d969620..033e41b4b59a5083e1e646cd8f2c5ba20187d7d4 100644
--- a/src/sbbs3/ftpsrvr.vcxproj
+++ b/src/sbbs3/ftpsrvr.vcxproj
@@ -58,7 +58,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\include\mozilla\js;..\xpdev;..\smblib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\js\win32.release\include\js;..\xpdev;..\smblib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;FTPSRVR_EXPORTS;JAVASCRIPT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -75,7 +75,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>wsock32.lib;winmm.lib;odbc32.lib;odbccp32.lib;../../lib/mozilla/js/win32.debug/js32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>wsock32.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>.\msvc.win32.dll.release/ftpsrvr.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\msvc.win32.dll.release/ftpsrvr.pdb</ProgramDatabaseFile>
@@ -104,7 +104,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\mozilla\js\src\dist\include;..\mozilla\js\src\dist\include\nsprpub;..\xpdev;..\smblib;%(AdditionalIncludeDirectories);..\comio</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\js\win32.release\include\js;..\mozilla\js\src\dist\include\nsprpub;..\xpdev;..\smblib;%(AdditionalIncludeDirectories);..\comio</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;FTPSRVR_EXPORTS;JAVASCRIPT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -123,7 +123,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>wsock32.lib;winmm.lib;odbc32.lib;odbccp32.lib;../mozilla/js/src/dist/lib/mozjs185-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>wsock32.lib;winmm.lib;odbc32.lib;odbccp32.lib;../js/win32.release/lib/mozjs185-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>.\msvc.win32.dll.debug/ftpsrvr.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/src/sbbs3/jsexec.vcxproj b/src/sbbs3/jsexec.vcxproj
index 2929d056026b1be11b154aada9c3a802988db45a..8dc1432a810d0cfcec3642cff351e7fcb44d235e 100644
--- a/src/sbbs3/jsexec.vcxproj
+++ b/src/sbbs3/jsexec.vcxproj
@@ -54,7 +54,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\include\mozilla\js;../xpdev;../smblib;../uifc;../conio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\js\win32.release\include\js;../xpdev;../smblib;../uifc;../conio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -94,7 +94,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\mozilla\js\src\dist\include;../xpdev;../smblib;../uifc;../conio;%(AdditionalIncludeDirectories);..\comio</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\js\win32.release\include\js;../xpdev;../smblib;../uifc;../conio;%(AdditionalIncludeDirectories);..\comio</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -112,7 +112,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>wsock32.lib;odbc32.lib;odbccp32.lib;../mozilla/js/src/dist/lib/mozjs185-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>wsock32.lib;odbc32.lib;odbccp32.lib;../js/win32.release/lib/mozjs185-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>.\msvc.win32.exe.debug/jsexec.exe</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/src/sbbs3/mailsrvr.vcxproj b/src/sbbs3/mailsrvr.vcxproj
index d3dd4b8d576d3984cbd9d0f19d951de38f1ebe2e..500b6f4a08629ebfb5e1079ddd2ab25ed457dd7b 100644
--- a/src/sbbs3/mailsrvr.vcxproj
+++ b/src/sbbs3/mailsrvr.vcxproj
@@ -57,7 +57,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\mozilla\js\src\dist\include;..\xpdev;..\smblib;..\comio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\js\win32.release\include\js;..\xpdev;..\smblib;..\comio;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;MAILSRVR_EXPORTS;SMB_IMPORTS;MD5_IMPORTS;JAVASCRIPT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -75,7 +75,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>wsock32.lib;winmm.lib;odbc32.lib;odbccp32.lib;../mozilla/js/src/dist/lib/mozjs185-1.0.lib;../../lib/microsoft/psdk/iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>wsock32.lib;winmm.lib;odbc32.lib;odbccp32.lib;..\js\win32.release\lib\mozjs185-1.0.lib;../../lib/microsoft/psdk/iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>.\msvc.win32.dll.debug/mailsrvr.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -106,7 +106,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\include\mozilla\js;..\xpdev;..\smblib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\js\win32.release\include\js;..\xpdev;..\smblib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;MAILSRVR_EXPORTS;SMB_IMPORTS;MD5_IMPORTS;JAVASCRIPT;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -123,7 +123,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>wsock32.lib;winmm.lib;odbc32.lib;odbccp32.lib;../../lib/mozilla/js/win32.debug/js32.lib;../../lib/microsoft/psdk/iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>wsock32.lib;winmm.lib;odbc32.lib;odbccp32.lib;..\js\win32.release\lib\mozjs185-1.0.lib;../../lib/mozilla/js/win32.debug/js32.lib;../../lib/microsoft/psdk/iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>.\msvc.win32.dll.release/mailsrvr.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<ProgramDatabaseFile>.\msvc.win32.dll.release/mailsrvr.pdb</ProgramDatabaseFile>
diff --git a/src/sbbs3/sbbs.vcxproj b/src/sbbs3/sbbs.vcxproj
index 0899b0b969e22d477caceed319032b9062bbda77..b4ab3117a0bdf264899a7ce32150a346004fff33 100644
--- a/src/sbbs3/sbbs.vcxproj
+++ b/src/sbbs3/sbbs.vcxproj
@@ -57,7 +57,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\mozilla\js\src\dist\include;..\..\include\mozilla\nspr;..\xpdev;..\smblib;..\..\include\cryptlib;%(AdditionalIncludeDirectories);..\comio</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\js\win32.release\include\js;..\..\include\mozilla\nspr;..\xpdev;..\smblib;..\..\include\cryptlib;%(AdditionalIncludeDirectories);..\comio</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;USE_CRYPTLIB;WIN32;_WINDOWS;_USRDLL;SBBS;SBBS_EXPORTS;SMB_EXPORTS;JAVASCRIPT;RINGBUF_SEM;RINGBUF_MUTEX;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -76,7 +76,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;../../lib/cryptlib/win32.release/cl32.lib;../../lib/microsoft/psdk/iphlpapi.lib;%(AdditionalDependencies);../mozilla/js/src/dist/lib/mozjs185-1.0.lib</AdditionalDependencies>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;../../lib/cryptlib/win32.release/cl32.lib;../../lib/microsoft/psdk/iphlpapi.lib;%(AdditionalDependencies);../js/win32.release/lib/mozjs185-1.0.lib</AdditionalDependencies>
<OutputFile>.\msvc.win32.dll.debug/sbbs.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
diff --git a/src/sbbs3/services.vcxproj b/src/sbbs3/services.vcxproj
index 75301bd641abfeec5c0c93c0124f4244b930b016..7db0b5d6d5e6b0a471bf0b572b62b7c0ea11c443 100644
--- a/src/sbbs3/services.vcxproj
+++ b/src/sbbs3/services.vcxproj
@@ -57,7 +57,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\mozilla\js\src\dist\include;..\xpdev;..\smblib;%(AdditionalIncludeDirectories);..\comio</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\js\win32.release\include\js;..\xpdev;..\smblib;%(AdditionalIncludeDirectories);..\comio</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;SERVICES_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -76,7 +76,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;../mozilla/js/src/dist/lib/mozjs185-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;../js/win32.release/lib/mozjs185-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>.\msvc.win32.dll.debug/services.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -107,7 +107,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\include\mozilla\js;..\xpdev;..\smblib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\js\win32.release\include\js;..\xpdev;..\smblib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;SERVICES_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
diff --git a/src/sbbs3/websrvr.vcxproj b/src/sbbs3/websrvr.vcxproj
index 58f1803bdf70f0241b10299e05263e7243923e90..32c79f176f3c6e19095cd96d3eb4a29c60b16126 100644
--- a/src/sbbs3/websrvr.vcxproj
+++ b/src/sbbs3/websrvr.vcxproj
@@ -58,7 +58,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
- <AdditionalIncludeDirectories>..\..\include\mozilla\js;..\xpdev;..\smblib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\js\win32.release\include\js;..\xpdev;..\smblib;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>NDEBUG;WIN32;_WINDOWS;_USRDLL;WEBSRVR_EXPORTS;RINGBUF_SEM;RINGBUF_MUTEX;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -104,7 +104,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>..\mozilla\js\src\dist\include;..\xpdev;..\smblib;%(AdditionalIncludeDirectories);..\comio</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>..\js\win32.release\include\js;..\xpdev;..\smblib;%(AdditionalIncludeDirectories);..\comio</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;WIN32;_WINDOWS;_USRDLL;WEBSRVR_EXPORTS;RINGBUF_SEM;RINGBUF_MUTEX;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -123,7 +123,7 @@
<Culture>0x0409</Culture>
</ResourceCompile>
<Link>
- <AdditionalDependencies>odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;../mozilla/js/src/dist/lib/mozjs185-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>odbc32.lib;odbccp32.lib;wsock32.lib;winmm.lib;../js/win32.release/lib/mozjs185-1.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>.\msvc.win32.dll.debug/websrvr.dll</OutputFile>
<SuppressStartupBanner>true</SuppressStartupBanner>
<GenerateDebugInformation>true</GenerateDebugInformation>