diff --git a/k-meleon/KMeleon10.sln b/k-meleon/KMeleon10.sln
index b9ff7783..40711480 100644
--- a/k-meleon/KMeleon10.sln
+++ b/k-meleon/KMeleon10.sln
@@ -1,5 +1,7 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.40629.0
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "k-meleon", "app\KMeleon.vcxproj", "{7BB6C711-139E-C685-6DF2-191FFF772A85}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "bmpmenu", "kplugins\bmpmenu\bmpmenu.vcxproj", "{07094943-C44A-4247-83AD-86CE1448130B}"
diff --git a/k-meleon/app/KMeleon.vcxproj b/k-meleon/app/KMeleon.vcxproj
index dc910636..2730326d 100644
--- a/k-meleon/app/KMeleon.vcxproj
+++ b/k-meleon/app/KMeleon.vcxproj
@@ -103,8 +103,9 @@
true
true
true
- Use
+ NotUsing
NoExtensions
+ 4800;4819;4996
MachineX86
@@ -115,7 +116,7 @@
0x40000
true
UseLinkTimeCodeGeneration
- ..\..\xulrunner-sdk\lib_$(Configuration);%(AdditionalLibraryDirectories)
+ ..\..\xulrunner-sdk\lib;%(AdditionalLibraryDirectories)
diff --git a/k-meleon/kplugins/bmpmenu/bmpmenu.vcxproj b/k-meleon/kplugins/bmpmenu/bmpmenu.vcxproj
index 85c4b51e..5bd794fc 100644
--- a/k-meleon/kplugins/bmpmenu/bmpmenu.vcxproj
+++ b/k-meleon/kplugins/bmpmenu/bmpmenu.vcxproj
@@ -80,6 +80,7 @@
true
..\..\shared;h:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories)
NoExtensions
+ 4800;4819;4996
Windows
diff --git a/k-meleon/kplugins/bookmarks/bookmarks.vcxproj b/k-meleon/kplugins/bookmarks/bookmarks.vcxproj
index bcaf5833..9e774895 100644
--- a/k-meleon/kplugins/bookmarks/bookmarks.vcxproj
+++ b/k-meleon/kplugins/bookmarks/bookmarks.vcxproj
@@ -96,6 +96,7 @@
true
..\..\shared;%(AdditionalIncludeDirectories)
NoExtensions
+ 4800;4819;4996
Windows
diff --git a/k-meleon/kplugins/favorites/favorites.vcxproj b/k-meleon/kplugins/favorites/favorites.vcxproj
index c5a4e5f2..53131cee 100644
--- a/k-meleon/kplugins/favorites/favorites.vcxproj
+++ b/k-meleon/kplugins/favorites/favorites.vcxproj
@@ -99,6 +99,7 @@
true
..\..\shared;%(AdditionalIncludeDirectories)
NoExtensions
+ 4800;4819;4996
Windows
diff --git a/k-meleon/kplugins/fullscreen/fullscreen.vcxproj b/k-meleon/kplugins/fullscreen/fullscreen.vcxproj
index 0bb73ba2..86cb3eaa 100644
--- a/k-meleon/kplugins/fullscreen/fullscreen.vcxproj
+++ b/k-meleon/kplugins/fullscreen/fullscreen.vcxproj
@@ -94,6 +94,7 @@
true
..\..\..\xulrunner-sdk\include\nspr;..\..\..\xulrunner-sdk\include;..\..\shared;%(AdditionalIncludeDirectories)
NoExtensions
+ 4800;4819;4996
Windows
@@ -103,7 +104,7 @@
true
$(IntDir)$(TargetName).pdb
$(IntDir)$(TargetName).lib
- ..\..\..\xulrunner-sdk\lib_$(Configuration);%(AdditionalLibraryDirectories)
+ ..\..\..\xulrunner-sdk\lib;%(AdditionalLibraryDirectories)
nss3.lib;mozjs.lib;xul.lib;mozalloc.lib;xpcomglue_s.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
diff --git a/k-meleon/kplugins/gestures/gestures.vcxproj b/k-meleon/kplugins/gestures/gestures.vcxproj
index 73492ec8..09ab819c 100644
--- a/k-meleon/kplugins/gestures/gestures.vcxproj
+++ b/k-meleon/kplugins/gestures/gestures.vcxproj
@@ -91,6 +91,7 @@
true
..\..\..\xulrunner-sdk\include\nspr;..\..\..\xulrunner-sdk\include;..\..\shared;h:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories)
NoExtensions
+ 4800;4819;4996
Windows
@@ -101,7 +102,7 @@
$(IntDir)$(TargetName).pdb
$(IntDir)$(TargetName).pgd
$(IntDir)$(TargetName).lib
- ..\..\..\xulrunner-sdk\lib_$(Configuration);h:\Program Files (x86)\Visual Leak Detector\lib\Win32;%(AdditionalLibraryDirectories)
+ ..\..\..\xulrunner-sdk\lib;h:\Program Files (x86)\Visual Leak Detector\lib\Win32;%(AdditionalLibraryDirectories)
nss3.lib;mozjs.lib;xul.lib;mozalloc.lib;xpcomglue_s.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
diff --git a/k-meleon/kplugins/hotlist/hotlist.vcxproj b/k-meleon/kplugins/hotlist/hotlist.vcxproj
index a3d392b6..0674e8c4 100644
--- a/k-meleon/kplugins/hotlist/hotlist.vcxproj
+++ b/k-meleon/kplugins/hotlist/hotlist.vcxproj
@@ -93,6 +93,7 @@
true
..\..\shared;%(AdditionalIncludeDirectories)
NoExtensions
+ 4800;4819;4996
Windows
diff --git a/k-meleon/kplugins/jsbridge/JSBridge.vcxproj b/k-meleon/kplugins/jsbridge/JSBridge.vcxproj
index 1ffed53d..f31b3817 100644
--- a/k-meleon/kplugins/jsbridge/JSBridge.vcxproj
+++ b/k-meleon/kplugins/jsbridge/JSBridge.vcxproj
@@ -93,6 +93,7 @@
true
$(IntDir);..\..\..\xulrunner-sdk\include\nspr;..\..\..\xulrunner-sdk\include;..\..\shared;%(AdditionalIncludeDirectories)
NoExtensions
+ 4800;4819;4996
Windows
@@ -102,12 +103,12 @@
true
$(IntDir)$(TargetName).pdb
$(IntDir)$(TargetName).lib
- ..\..\..\xulrunner-sdk\lib_$(Configuration);%(AdditionalLibraryDirectories)
+ ..\..\..\xulrunner-sdk\lib;%(AdditionalLibraryDirectories)
nss3.lib;xul.lib;mozalloc.lib;mozjs.lib;xpcomglue_s.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
- ..\..\..\xulrunner-sdk\bin\header.py -I ../../../xulrunner-sdk/idl -o "$(IntDir)nsIJSBridge.h" idl/nsIJSBridge.idl
-..\..\..\xulrunner-sdk\bin\typelib.py -I ../../../xulrunner-sdk/idl -o "$(IntDir)jsbridge.xpt" idl/nsIJSBridge.idl
+ c:\mozilla-build\python\python ..\..\..\xulrunner-sdk\sdk\bin\header.py -I ../../../xulrunner-sdk/idl -o "$(IntDir)nsIJSBridge.h" idl/nsIJSBridge.idl
+c:\mozilla-build\python\python ..\..\..\xulrunner-sdk\sdk\bin\typelib.py -I ../../../xulrunner-sdk/idl -o "$(IntDir)jsbridge.xpt" idl/nsIJSBridge.idl
copy "$(IntDir)jsbridge.xpt" "$(OutDir)..\browser\components"
diff --git a/k-meleon/kplugins/login/login.vcxproj b/k-meleon/kplugins/login/login.vcxproj
index 26f5ba78..7bfe97bf 100644
--- a/k-meleon/kplugins/login/login.vcxproj
+++ b/k-meleon/kplugins/login/login.vcxproj
@@ -93,6 +93,7 @@
true
$(IntDir);..\..\..\xulrunner-sdk\include\nspr;..\..\..\xulrunner-sdk\include;..\..\shared;%(AdditionalIncludeDirectories)
NoExtensions
+ 4800;4819;4996
Windows
@@ -102,12 +103,12 @@
true
$(IntDir)$(TargetName).pdb
$(IntDir)$(TargetName).lib
- ..\..\..\xulrunner-sdk\lib_$(Configuration);%(AdditionalLibraryDirectories)
+ ..\..\..\xulrunner-sdk\lib;%(AdditionalLibraryDirectories)
mozjs.lib;xul.lib;mozalloc.lib;nss3.lib;xpcomglue_s.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
- ..\..\..\xulrunner-sdk\bin\header.py -I ../../../xulrunner-sdk/idl -o "$(IntDir)kmIHelper.h" idl/kmIHelper.idl
-..\..\..\xulrunner-sdk\bin\typelib.py -I ../../../xulrunner-sdk/idl -o "$(IntDir)kmHelper.xpt" idl/kmIHelper.idl
+ c:\mozilla-build\python\python ..\..\..\xulrunner-sdk\sdk\bin\header.py -I ../../../xulrunner-sdk/idl -o "$(IntDir)kmIHelper.h" idl/kmIHelper.idl
+c:\mozilla-build\python\python ..\..\..\xulrunner-sdk\sdk\bin\typelib.py -I ../../../xulrunner-sdk/idl -o "$(IntDir)kmHelper.xpt" idl/kmIHelper.idl
copy "$(IntDir)kmHelper.xpt" "$(OutDir)..\browser\components"
diff --git a/k-meleon/kplugins/macros2/macros.vcxproj b/k-meleon/kplugins/macros2/macros.vcxproj
index 4e03bd5f..b043877d 100644
--- a/k-meleon/kplugins/macros2/macros.vcxproj
+++ b/k-meleon/kplugins/macros2/macros.vcxproj
@@ -80,6 +80,7 @@
true
..\..\shared;h:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories)
NoExtensions
+ 4800;4819;4996
Windows
diff --git a/k-meleon/kplugins/privacy/privacy.vcxproj b/k-meleon/kplugins/privacy/privacy.vcxproj
index 8870897c..5e0865d1 100644
--- a/k-meleon/kplugins/privacy/privacy.vcxproj
+++ b/k-meleon/kplugins/privacy/privacy.vcxproj
@@ -88,6 +88,7 @@
true
..\..\..\xulrunner-sdk\include\nspr;..\..\..\xulrunner-sdk\include;..\..\shared;%(AdditionalIncludeDirectories)
NoExtensions
+ 4800;4819;4996
Windows
@@ -97,7 +98,7 @@
true
$(IntDir)$(TargetName).pdb
$(IntDir)$(TargetName).lib
- ..\..\..\xulrunner-sdk\lib_$(Configuration);%(AdditionalLibraryDirectories)
+ ..\..\..\xulrunner-sdk\lib;%(AdditionalLibraryDirectories)
mozjs.lib;nss3.lib;xul.lib;mozalloc.lib;xpcomglue_s.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
diff --git a/k-meleon/kplugins/rebar_menu/rebarmenu.vcxproj b/k-meleon/kplugins/rebar_menu/rebarmenu.vcxproj
index ec8acfa3..4ab85bd9 100644
--- a/k-meleon/kplugins/rebar_menu/rebarmenu.vcxproj
+++ b/k-meleon/kplugins/rebar_menu/rebarmenu.vcxproj
@@ -80,6 +80,7 @@
true
..\..\shared;h:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories)
NoExtensions
+ 4800;4819;4996
Windows
diff --git a/k-meleon/kplugins/sessions/sessions.vcxproj b/k-meleon/kplugins/sessions/sessions.vcxproj
index 6ea27bb4..4923fb20 100644
--- a/k-meleon/kplugins/sessions/sessions.vcxproj
+++ b/k-meleon/kplugins/sessions/sessions.vcxproj
@@ -80,6 +80,7 @@
true
..\..\shared;h:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories)
NoExtensions
+ 4800;4819;4996
Windows
diff --git a/k-meleon/kplugins/spellcheck/spellcheck.vcxproj b/k-meleon/kplugins/spellcheck/spellcheck.vcxproj
index a9a33a20..776b92f4 100644
--- a/k-meleon/kplugins/spellcheck/spellcheck.vcxproj
+++ b/k-meleon/kplugins/spellcheck/spellcheck.vcxproj
@@ -85,6 +85,7 @@
true
..\..\..\xulrunner-sdk\include\nspr;..\..\..\xulrunner-sdk\include;..\..\shared;%(AdditionalIncludeDirectories)
NoExtensions
+ 4800;4819;4996
Windows
@@ -94,7 +95,7 @@
true
$(IntDir)$(TargetName).pdb
$(IntDir)$(TargetName).lib
- ..\..\..\xulrunner-sdk\lib_$(Configuration);%(AdditionalLibraryDirectories)
+ ..\..\..\xulrunner-sdk\lib;%(AdditionalLibraryDirectories)
nss3.lib;mozjs.lib;xul.lib;mozalloc.lib;xpcomglue_s.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)
diff --git a/k-meleon/kplugins/toolbars/toolbars.vcxproj b/k-meleon/kplugins/toolbars/toolbars.vcxproj
index 2a1caf9b..e1fcfec0 100644
--- a/k-meleon/kplugins/toolbars/toolbars.vcxproj
+++ b/k-meleon/kplugins/toolbars/toolbars.vcxproj
@@ -81,6 +81,7 @@
true
..\..\shared;h:\Program Files (x86)\Visual Leak Detector\include;%(AdditionalIncludeDirectories)
NoExtensions
+ 4800;4819;4996
Windows