tools/mvsc: fix batch files

tools/mvsc/starpu_exec.bat

@@ -19,29 +19,23 @@ TITLE MSVC StarPU Execution
 ECHO.
 ECHO MSVC StarPU Execution
 
-IF NOT EXIST %STARPUPATH%\AUTHORS GOTO starpunotfound
-
-ECHO.
-ECHO Using StarPU in %STARPUPATH%
-
 IF "%1" == "" GOTO invalidparam
 IF NOT EXIST %1 GOTO invalidparam
 
+call .\starpu_var.bat
+
 mkdir starpu
-FOR %%F IN (%STARPUPATH%\bin\*dll) DO COPY %%F starpu\%%~nF
-FOR %%F IN (%STARPUPATH%\bin\*dll) DO COPY %%F starpu
-COPY c:\MinGW\bin\pthreadGC2.dll starpu
-COPY %STARPUPATH%\lib\libstarpu-1.2.lib starpu
+FOR %%F IN (%STARPU_PATH%\bin\*dll) DO COPY %%F starpu\%%~nF
+FOR %%F IN (%HWLOC%\bin\*dll) DO COPY %%F starpu
 
-set OLDPATH=%PATH%
+set STARPU_OLDPATH=%PATH%
 call "C:\Program Files (x86)\Microsoft Visual Studio 10.0\VC\vcvarsall.bat" x86
-echo cd starpu
-cl %1 /I%STARPUPATH%\include\starpu\1.2 /link starpu\libstarpu-1.2.lib
+cl %1 %STARPU_CFLAGS% %STARPU_LDFLAGS%
 
-set PATH=starpu;%PATH%
+set PATH=starpu;c:\MinGW\bin;%PATH%
 .\%~n1.exe
 
-set PATH=%OLDPATH%
+set PATH=%STARPU_OLDPATH%
 GOTO end
 
 :invalidparam
@@ -50,10 +44,4 @@ GOTO end
   EXIT /B 2
   GOTO end
 
-:starpunotfound
-  ECHO.
-  ECHO You need to set the variable STARPUPATH to a valid StarPU installation directory
-  EXIT /B 1
-  GOTO end
-
 :end

tools/mvsc/starpu_var.bat.in

@@ -19,22 +19,21 @@ TITLE MSVC StarPU Environment
 ECHO.
 ECHO MSVC StarPU Environment
 
-set STARPU_PATH=@prefix@
-
-IF NOT EXIST %STARPUPATH%\AUTHORS GOTO starpunotfound
+IF NOT EXIST %STARPU_PATH%\AUTHORS GOTO starpunotfound
 
 ECHO.
-ECHO Setting environment from %STARPUPATH%
+ECHO Setting environment from %STARPU_PATH%
 
 set STARPU_LIBDIR=%STARPU_PATH%/lib
 set STARPU_INCLUDEDIR=%PREFIX%/include
 set STARPU_CFLAGS=/I%STARPU_INCLUDEDIR%\starpu\@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_CPPFLAGS@
+set STARPU_LDFLAGS=/link %STARPU_PATH%\lib\libstarpu-@STARPU_EFFECTIVE_VERSION@.lib
 
 GOTO end
 
 :starpunotfound
   ECHO.
-  ECHO You need to set the variable STARPUPATH to a valid StarPU installation directory
+  ECHO You need to set the variable STARPU_PATH to a valid StarPU installation directory
   exit /B 1
   GOTO end