set installpath=%thirdpartyGeneration%\thirdparty_install
set binpath=%thirdpartyGeneration%\thirdparty_bin
set sourcepath=%thirdpartyGeneration%\thirdparty_source
-set creaThirdPartyLibraries=%thirdpartyInstallPath%\creaThirdParty_libraries
+set creaThirdPartyLibraries=%thirdpartyGeneration%\thirdparty_temp\creaThirdParty_libraries
set qt=Qt-4.7.3
set wxWidgets=wxWidgets-2.9.2
set GDCMINSTALLDIR=%installpath%\%gdcm%
set TTHDIR=%sourcepath%\%tth%
-if not exist %miktex% set miktex="%ProgramFilesPath_x64%\MiKTeX 2.9\miktex\bin\texworks.exe"
if not exist %miktex% (
+ set miktex="%ProgramFilesPath_x64%\MiKTeX 2.9\miktex\bin\texworks.exe"
+ if not exist %miktex% (
echo ERROR!!! MiKTex has not been found in the system
exit
+ )
+ else (
+ set miktex="%ProgramFilesPath_x64%\MiKTeX 2.9"
+ )
+)
+else (
+set miktex="%ProgramFilesPath_x86%\MiKTeX 2.9"
)
echo -----------------------------------
echo -----------------------------------
echo ThirdpartyGeneration=%thirdpartyGeneration%
echo MikTex=%miktex%
+echo miktexAux=%miktexAux%
echo InstallPath=%installpath%
echo BinPath=%binpath%
echo SourcePath=%sourcepath%
echo -----------------------------------
mkdir %creaThirdPartyLibraries%\tth
XCOPY %TTHDIR%\* %creaThirdPartyLibraries%\%tth% /s /i
+
echo -----------------------------------
echo -------------MiKText---------------
echo -----------------------------------
mkdir %creaThirdPartyLibraries%\%miktexAux%
-XCOPY %miktex%\* %creaThirdPartyLibraries%\%miktexAux% /s /i
+XCOPY %miktex%\* %creaThirdPartyLibraries%\%miktexAux% /s /i
\ No newline at end of file