1
0

Build fixes

This commit is contained in:
Scott Graves
2017-03-24 12:07:57 -05:00
parent 29d370d63a
commit 3b61b53fd1
4 changed files with 10 additions and 4 deletions

View File

@@ -1,4 +1,4 @@
Work Laptop Work Laptop
vitals thirsty tattoo unjustly already lexicon ruthless rated skater voyage avoid jeers aunt tawny richly glass menu kidneys went wounded wounded trendy towel lipstick raking bacon dozen blip aggravate vitals thirsty tattoo unjustly already lexicon ruthless rated skater voyage avoid jeers aunt tawny richly glass menu kidneys went wounded wounded trendy towel lipstick raking bacon dozen blip aggravate
Home Laptop Home Laptop

View File

@@ -33,7 +33,6 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
[Files] [Files]
Source: ".\dist\Debug\siadrive.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: ".\dist\Debug\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs Source: ".\dist\Debug\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
; NOTE: Don't use "Flags: ignoreversion" on any shared system files ; NOTE: Don't use "Flags: ignoreversion" on any shared system files

View File

@@ -33,7 +33,6 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
[Files] [Files]
Source: ".\dist\Release\siadrive.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: ".\dist\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs Source: ".\dist\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
; NOTE: Don't use "Flags: ignoreversion" on any shared system files ; NOTE: Don't use "Flags: ignoreversion" on any shared system files

View File

@@ -18,7 +18,15 @@ mkdir build\%TARGET_MODE% >NUL 2>&1
pushd build\%TARGET_MODE% >NUL 2>&1 pushd build\%TARGET_MODE% >NUL 2>&1
(%CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=%TARGET_MODE% -DSIADRIVE_INSTALL_FOLDER="%ROOT%dist\%TARGET_MODE%" ..\..) && ( (%CMAKE% -G "Visual Studio 14 2015 Win64" -DCMAKE_BUILD_TYPE=%TARGET_MODE% -DSIADRIVE_INSTALL_FOLDER="%ROOT%dist\%TARGET_MODE%" ..\..) && (
%CMAKE% --build . --config %TARGET_MODE%) && ( %CMAKE% --build . --config %TARGET_MODE%) && (
%CMAKE% --build . --target install --config %TARGET_MODE% %CMAKE% --build . --target install --config %TARGET_MODE% && (
rd /s /q "%ROOT%dist\%TARGET_MODE%\config"
rd /s /q "%ROOT%dist\%TARGET_MODE%\htdocs\.idea"
del /q "%ROOT%dist\%TARGET_MODE%\*.log"
if "%TARGET_MODE%"=="Release" (
del /q "%ROOT%dist\%TARGET_MODE%\*.lib"
del /q "%ROOT%dist\%TARGET_MODE%\*.pdb"
)
)
) )
popd popd