BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:teamfisk/TacticalZ

Browse Source
This commit is contained in:
Tleety
2016-03-14 01:59:41 +01:00
parent 0b485163c9 e527badab4
commit 788d80f721
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Setup/Inno Setup Script.iss
+2 -2
View File
@@ -4,7 +4,7 @@
#define MyAppName "Axyz" #define MyAppName "Axyz"
#define MyAppVersion "1.0" #define MyAppVersion "1.0"
#define MyAppURL "https://github.com/teamfisk/TacticalZ" #define MyAppURL "https://github.com/teamfisk/TacticalZ"
#define MyAppExeName "TacticalZ.exe" #define MyAppExeName "Axyz.exe"
[Setup] [Setup]
; NOTE: The value of AppId uniquely identifies this application. ; NOTE: The value of AppId uniquely identifies this application.
@@ -57,7 +57,7 @@ Source: "..\..\bin\glfw3.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\bin\imgui.ini"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\bin\imgui.ini"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\bin\Input.ini"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\bin\Input.ini"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\bin\libpng16.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\bin\libpng16.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\bin\TacticalZ.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\bin\Axyz.exe"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\bin\xerces-c_3_1.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\bin\xerces-c_3_1.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\bin\zlib.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\..\bin\zlib.dll"; DestDir: "{app}"; Flags: ignoreversion
Source: "..\..\deps\redist\VC_redist.x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall Source: "..\..\deps\redist\VC_redist.x64.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall
src/Game/CMakeLists.txt
+2 -2
View File
@@ -53,11 +53,11 @@ target_link_libraries(Game
${LIBRARIES} ${LIBRARIES}
) )
add_executable(TacticalZ add_executable(Axyz
main.cpp main.cpp
${CMAKE_SOURCE_DIR}/resources/TacticalZ.rc ${CMAKE_SOURCE_DIR}/resources/TacticalZ.rc
) )
target_link_libraries(TacticalZ target_link_libraries(Axyz
Game Game
${LIBRARIES} ${LIBRARIES}
) )