Fix VS project files to match with source code file changes

diff --git a/wpa_supplicant/nmake.mak b/wpa_supplicant/nmake.mak
index f2b1049ec9140a17f43c6274041662d2e3f8156f..80e0ac8802bc9689c168678eb1a9bd0ad8e9d7df 100644 (file)
--- a/wpa_supplicant/nmake.mak
+++ b/wpa_supplicant/nmake.mak
@@ -63,6 +63,8 @@ OBJS = \
        $(OBJDIR)\os_win32.obj \
        $(OBJDIR)\eloop_win.obj \
        $(OBJDIR)\sha1.obj \
+       $(OBJDIR)\sha1-tlsprf.obj \
+       $(OBJDIR)\sha1-pbkdf2.obj \
        $(OBJDIR)\md5.obj \
        $(OBJDIR)\aes-cbc.obj \
        $(OBJDIR)\aes-ctr.obj \
@@ -115,11 +117,13 @@ OBJS = \
        $(OBJDIR)\blacklist.obj \
        $(OBJDIR)\scan.obj \
        $(OBJDIR)\wpas_glue.obj \
+       $(OBJDIR)\eap_register.obj \
        $(OBJDIR)\config.obj \
        $(OBJDIR)\l2_packet_winpcap.obj \
        $(OBJDIR)\tls_openssl.obj \
        $(OBJDIR)\ms_funcs.obj \
        $(OBJDIR)\crypto_openssl.obj \
+       $(OBJDIR)\fips_prf_openssl.obj \
        $(OBJDIR)\pcsc_funcs.obj \
        $(OBJDIR)\notify.obj \
        $(OBJDIR)\ndis_events.obj
@@ -153,9 +157,12 @@ OBJS_c = \
 OBJS_p = \
        $(OBJDIR)\os_win32.obj \
        $(OBJDIR)\common.obj \
+       $(OBJDIR)\wpa_debug.obj \
+       $(OBJDIR)\wpabuf.obj \
        $(OBJDIR)\sha1.obj \
        $(OBJDIR)\md5.obj \
        $(OBJDIR)\crypto_openssl.obj \
+       $(OBJDIR)\sha1-pbkdf2.obj \
        $(OBJDIR)\wpa_passphrase.obj
 
 LIBS = wbemuuid.lib libcmt.lib kernel32.lib uuid.lib ole32.lib oleaut32.lib \

diff --git a/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj b/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
index 45b49baae1d7be96667ea3db0fe5784d7f54172a..d799f05563eafc4d8817eaa4005f522d6fae170d 100755 (executable)
--- a/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
+++ b/wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj
@@ -290,6 +290,10 @@
                                RelativePath="..\..\..\src\eap_common\eap_peap_common.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\eap_register.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\..\src\eap_peer\eap_sim.c"\r
                                >\r

diff --git a/wpa_supplicant/vs2005/wpa_cli/wpa_cli.vcproj b/wpa_supplicant/vs2005/wpa_cli/wpa_cli.vcproj
index 8edf12d60ba63daa81266e30c5338988f4a9b544..d2de768e7cdcaf76fdd6eb7c4a3a5a8978cbbd67 100755 (executable)
--- a/wpa_supplicant/vs2005/wpa_cli/wpa_cli.vcproj
+++ b/wpa_supplicant/vs2005/wpa_cli/wpa_cli.vcproj
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\..\src\utils"\r
+                               AdditionalIncludeDirectories="..\..\..\src;..\..\..\src\utils"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -118,7 +118,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\..\src\utils"\r
+                               AdditionalIncludeDirectories="..\..\..\src;..\..\..\src\utils"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r

diff --git a/wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj b/wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj
index dccf9b5cb3dc82ae06933e300f26114b429b3375..b10784246d715f3b174a3836ab7bff2d1bfc9595 100755 (executable)
--- a/wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj
+++ b/wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj
@@ -40,7 +40,7 @@
                        <Tool\r
                                Name="VCCLCompilerTool"\r
                                Optimization="0"\r
-                               AdditionalIncludeDirectories="..\..\..\src\utils;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..\..\src;..\..\..\src\utils;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                MinimalRebuild="true"\r
                                BasicRuntimeChecks="3"\r
@@ -119,7 +119,7 @@
                        />\r
                        <Tool\r
                                Name="VCCLCompilerTool"\r
-                               AdditionalIncludeDirectories="..\..\..\src\utils;C:\dev\openssl\include"\r
+                               AdditionalIncludeDirectories="..\..\..\src;..\..\..\src\utils;C:\dev\openssl\include"\r
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;CONFIG_WIN32_DEFAULTS"\r
                                RuntimeLibrary="2"\r
                                UsePrecompiledHeader="0"\r

diff --git a/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj b/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
index 9d14f520fa1c92836a4ce66c9576becc4f49b14b..e21f40a114ed4f495732068fbe4ba785729a45c1 100755 (executable)
--- a/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
+++ b/wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj
@@ -298,6 +298,10 @@
                                RelativePath="..\..\..\src\eap_common\eap_peap_common.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\eap_register.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\..\src\eap_peer\eap_tls.c"\r
                                >\r

diff --git a/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj b/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
index f7223da27ec16dcf9bb62a1a9ddf511e286c886f..d455b4b3c3b178c0019f1dda6f8af5eed9cc631b 100755 (executable)
--- a/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
+++ b/wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj
@@ -298,6 +298,10 @@
                                RelativePath="..\..\..\src\eap_common\eap_peap_common.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\eap_register.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\..\src\eap_peer\eap_tls.c"\r
                                >\r