:: BUILD THE PROJECT
:: ---------------------------------------------------------------------------
-msbuild.exe /property:Configuration=%2 /property:Platform=Win32 /target:Clean /verbosity:normal %1
+msbuild.exe /property:Configuration=%3 /property:Platform=%2 /target:Clean /verbosity:normal "%~1"
if not "%ERRORLEVEL%"=="0" (
echo. && echo Build process has failed!
echo. && pause && exit
)
-msbuild.exe /property:Configuration=%2 /property:Platform=Win32 /target:Rebuild /verbosity:normal %1
+msbuild.exe /property:Configuration=%3 /property:Platform=%2 /target:Rebuild /verbosity:normal "%~1"
if not "%ERRORLEVEL%"=="0" (
echo. && echo Build process has failed!
echo. && pause && exit
)
-msbuild.exe /property:Configuration=%2 /property:Platform=Win32 /target:Build /verbosity:normal %1
+msbuild.exe /property:Configuration=%3 /property:Platform=%2 /target:Build /verbosity:normal "%~1"
if not "%ERRORLEVEL%"=="0" (
echo. && echo Build process has failed!
echo. && pause && exit
set "LAMEXP_CONFIG=Release"
)
+if "%LAMEXP_PLATFORM%"=="" (
+ set "LAMEXP_PLATFORM=Win32"
+)
+
if not "%LAMEXP_REDIST%"=="0" (
set "LAMEXP_REDIST=1"
)
:: SETUP PATHS
:: ---------------------------------------------------------------------------
-set "OUT_PATH=%~dp0\..\..\bin\%LAMEXP_CONFIG%"
+set "BIN_PATH=%~dp0\..\..\bin\%LAMEXP_PLATFORM%\%LAMEXP_CONFIG%"
set "TMP_PATH=%TEMP%\~LameXP.%LAMEXP_CONFIG%.%ISO_DATE%.%RANDOM%.tmp"
-set "OBJ_PATH=%~dp0\..\..\obj\%LAMEXP_CONFIG%"
-set "MOC_PATH=%~dp0\..\..\tmp"
-set "IPC_PATH=%~dp0\..\..\ipch"
if "%LAMEXP_SKIP_BUILD%"=="YES" (
goto SkipBuildThisTime
:: CLEAN UP
:: ---------------------------------------------------------------------------
-del /Q "%OUT_PATH%\*.exe"
-del /Q "%OUT_PATH%\*.dll"
-del /Q "%OBJ_PATH%\*.obj"
-del /Q "%OBJ_PATH%\*.res"
-del /Q "%OBJ_PATH%\*.bat"
-del /Q "%OBJ_PATH%\*.idb"
-del /Q "%OBJ_PATH%\*.log"
-del /Q "%OBJ_PATH%\*.manifest"
-del /Q "%OBJ_PATH%\*.lastbuildstate"
-del /Q "%OBJ_PATH%\*.htm"
-del /Q "%OBJ_PATH%\*.dep"
-del /Q "%MOC_PATH%\*.cpp"
-del /Q "%MOC_PATH%\*.h"
-del /Q /S "%IPC_PATH%\*.*"
+echo.
+echo ----------------------------------------------------------------
+echo Cleaning up
+echo ----------------------------------------------------------------
+echo.
+
+for %%i in (bin,obj,tmp,ipch) do (
+ del /Q /S /F "%~dp0\..\..\%%i\*.*"
+)
:: ---------------------------------------------------------------------------
:: UPDATE LANGUAGE FILES AND DCOS
:: BUILD THE BINARIES
:: ---------------------------------------------------------------------------
-call "%~dp0\_build.bat" "%~dp0\..\..\%PATH_VCPROJ%" "%LAMEXP_CONFIG%"
+call "%~dp0\_build.bat" "%~dp0\..\..\%PATH_VCPROJ%" "%LAMEXP_PLATFORM%" "%LAMEXP_CONFIG%"
:SkipBuildThisTime
)
:: ---------------------------------------------------------------------------
-:: POST BUILD OPERATIONS
+:: COPY BINARY FILES AND REDIST
:: ---------------------------------------------------------------------------
rd /S /Q "%TMP_PATH%"
mkdir "%TMP_PATH%"
for %%i in (exe,dll) do (
- copy "%OUT_PATH%\*.%%i" "%TMP_PATH%"
+ copy "%BIN_PATH%\*.%%i" "%TMP_PATH%"
)
if "%LAMEXP_REDIST%"=="1" (
)
copy "%QTDIR%\plugins\imageformats\q???4.dll" "%TMP_PATH%\imageformats"
for %%i in (100,110,120) do (
- if exist %PATH_MSCDIR%\VC\redist\x86\Microsoft.VC%%i.CRT\*.dll" (
+ if exist "%PATH_MSCDIR%\VC\redist\x86\Microsoft.VC%%i.CRT\*.dll" (
copy "%PATH_MSCDIR%\VC\redist\x86\Microsoft.VC%%i.CRT\*.dll" "%TMP_PATH%"
)
)
#define VER_LAMEXP_MAJOR 4
#define VER_LAMEXP_MINOR_HI 1
#define VER_LAMEXP_MINOR_LO 1
-#define VER_LAMEXP_TYPE Hotfix
-#define VER_LAMEXP_PATCH 10
-#define VER_LAMEXP_BUILD 1649
+#define VER_LAMEXP_TYPE Beta
+#define VER_LAMEXP_PATCH 11
+#define VER_LAMEXP_BUILD 1650
#define VER_LAMEXP_CONFG 1558
///////////////////////////////////////////////////////////////////////////////