Skip to content
This repository has been archived by the owner on Oct 1, 2023. It is now read-only.

Commit

Permalink
Changed build system. Changed materials. Alpha material works now. Fi…
Browse files Browse the repository at this point in the history
…xed normal mapping.
  • Loading branch information
Your Name committed Aug 25, 2018
1 parent 8541f31 commit 4e01b24
Show file tree
Hide file tree
Showing 137 changed files with 201,164 additions and 173,231 deletions.
2 changes: 1 addition & 1 deletion appName.bat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
set APP_NAME="NoIdea"
set APP_NAME="DirectX 11 Demo"
16 changes: 16 additions & 0 deletions buildAll.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
@echo off

if "%BUILD_ALL_MODE%"=="release" (
call ".\code\buildWin.bat" -x64 -noRun -releaseMode -folder
rem call ".\code\buildWin.bat" -x86 -noRun -releaseMode -folder
)

if "%BUILD_ALL_MODE%"=="optimized" (
call ".\code\buildWin.bat" -x64 -noRun -releaseMode -folder -fullOptimize
rem call ".\code\buildWin.bat" -x86 -noRun -releaseMode -folder -fullOptimize
)

if "%BUILD_ALL_MODE%"=="ship" (
call ".\code\buildWin.bat" -x64 -noRun -releaseMode -folder -fullOptimize -ship
rem call ".\code\buildWin.bat" -x86 -noRun -releaseMode -folder -fullOptimize -ship
)
63 changes: 63 additions & 0 deletions buildCreateInstallerAndZip.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
rem This file can not be called on its own.

if %COMPILE_TOKEN% == "" exit


rem Create portable version.

set RELEASE_FOLDER_ZIP=.\releases\%APP_NAME%

"%ZIP7%" a "%RELEASE_FOLDER_ZIP% %PLATFORM2%.zip" "%RELEASE_FOLDER%\*"


rem Create installer version.
(
echo #define MyAppName "%APP_NAME%"
echo #define MyAppVersion "%APP_VERSION%"
echo #define MyAppURL "%GITHUB_LINK%"
echo #define MyAppExeName "%APP_NAME%.exe"
echo.
echo [Setup]
echo AppId={#MyAppName} "%PLATFORM2%"
echo AppName={#MyAppName}
echo AppVersion={#MyAppVersion}
echo AppPublisherURL={#MyAppURL}
echo AppSupportURL={#MyAppURL}
echo AppUpdatesURL={#MyAppURL}
echo AllowNoIcons=yes
echo DefaultDirName={pf}\{#MyAppName}
echo DisableProgramGroupPage=yes
echo OutputDir=.\releases\
echo OutputBaseFilename={#MyAppName} Installer %PLATFORM2%
echo UninstallDisplayIcon={app}\{#MyAppExeName}
echo UninstallDisplayName={#MyAppName} %APP_VERSION% %PLATFORM2%
echo Compression=lzma
echo SolidCompression=yes

if "%PLATFORM2%"=="x64" (
echo ArchitecturesInstallIn64BitMode=x64
)

echo.
echo [Languages]
echo Name: "english"; MessagesFile: "compiler:Default.isl"
echo.
echo [Tasks]
echo Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
echo.
echo [Files]
echo Source: "%RELEASE_FOLDER%\%APP_NAME%.exe"; DestDir: "{app}"; Flags: ignoreversion
echo Source: "%RELEASE_FOLDER%\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
echo.
echo [Icons]
echo Name: "{commonprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
echo Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
echo.
echo [Run]
echo Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent

) > setupScript.iss

"%INNO_SETUP_COMPILER%" setupScript.iss

del setupScript.iss
9 changes: 2 additions & 7 deletions buildRelease.bat
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
@echo off

rem cd code
rem call ..\\appName.bat

rem call ".\buildWin.bat" -x64 -noRun -release -ship
call ".\code\buildWin.bat" -x64 -noRun -release -ship
rem call ".\code\buildWin.bat" -x86 -noRun -release -ship
rem PAUSE
set BUILD_ALL_MODE=release
call buildAll.bat
4 changes: 2 additions & 2 deletions buildReleaseOptimized.bat
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@echo off

call ".\code\buildWin.bat" -x64 -noRun -release -ship -fullOptimize
rem call ".\code\buildWin.bat" -x86 -noRun -release -ship -fullOptimize
set BUILD_ALL_MODE=optimized
call buildAll.bat
4 changes: 4 additions & 0 deletions buildReleaseOptimizedShip.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@echo off

set BUILD_ALL_MODE=ship
call buildAll.bat
Loading

0 comments on commit 4e01b24

Please sign in to comment.