Skip to content

Commit

Permalink
Rename client binary 'teeworlds' -> 'chillerbot-h7'
Browse files Browse the repository at this point in the history
  • Loading branch information
ChillerDragon committed Aug 1, 2019
1 parent cec1150 commit ecfc137
Show file tree
Hide file tree
Showing 13 changed files with 14 additions and 14 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ set_property(DIRECTORY APPEND PROPERTY CMAKE_CONFIGURE_DEPENDS
)

set(SERVER_EXECUTABLE teeworlds_srv CACHE STRING "Name of the built server executable")
set(CLIENT_EXECUTABLE teeworlds CACHE STRING "Name of the build client executable")
set(CLIENT_EXECUTABLE chillerbot-h7 CACHE STRING "Name of the build client executable")

########################################################################
# Download dependencies
Expand Down Expand Up @@ -302,7 +302,7 @@ if(TARGET_OS AND TARGET_OS STREQUAL "mac")
find_program(HDIUTIL hdiutil)
endif()

message(STATUS "******** Teeworlds ********")
message(STATUS "******** Teeworlds (chillerbot-h7) ********")
message(STATUS "Target OS: ${TARGET_OS} ${TARGET_BITS}bit")
message(STATUS "Compiler: ${CMAKE_CXX_COMPILER}")
message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")
Expand Down Expand Up @@ -1372,9 +1372,9 @@ if(CLIENT)
if(TARGET_OS STREQUAL "windows")
set(CLIENT_ICON "other/icons/${CLIENT_EXECUTABLE}.rc")
if(NOT MINGW)
set(CLIENT_MANIFEST "other/manifest/teeworlds.manifest")
set(CLIENT_MANIFEST "other/manifest/chillerbot-h7.manifest")
else()
set(CLIENT_MANIFEST "other/manifest/teeworlds.rc")
set(CLIENT_MANIFEST "other/manifest/chillerbot-h7.rc")
endif()
else()
set(CLIENT_ICON)
Expand Down
8 changes: 4 additions & 4 deletions bam.lua
Original file line number Diff line number Diff line change
Expand Up @@ -313,15 +313,15 @@ shared_icons = {}
function SharedIcons(compiler)
if not shared_icons[compiler] then
local server_icon = ResCompile("other/icons/teeworlds_srv_" .. compiler .. ".rc", compiler)
local client_icon = ResCompile("other/icons/teeworlds_" .. compiler .. ".rc", compiler)
local client_icon = ResCompile("other/icons/chillerbot-h7_" .. compiler .. ".rc", compiler)
shared_icons[compiler] = {server=server_icon, client=client_icon}
end
return shared_icons[compiler]
end

function SharedManifests(compiler)
if not shared_manifests then
local client_manifest = ResCompile("other/manifest/teeworlds.rc", compiler)
local client_manifest = ResCompile("other/manifest/chillerbot-h7.rc", compiler)
shared_manifests = {client=client_manifest}
end
return shared_manifests
Expand All @@ -342,7 +342,7 @@ function BuildClient(settings, family, platform)
local game_client = Compile(settings, CollectRecursive("src/game/client/*.cpp"), SharedClientFiles())
local game_editor = Compile(settings, Collect("src/game/editor/*.cpp"))

Link(settings, "teeworlds", libs["zlib"], libs["md5"], libs["wavpack"], libs["png"], libs["json"], client, game_client, game_editor)
Link(settings, "chillerbot-h7", libs["zlib"], libs["md5"], libs["wavpack"], libs["png"], libs["json"], client, game_client, game_editor)
end

function BuildServer(settings, family, platform)
Expand Down Expand Up @@ -496,7 +496,7 @@ if ScriptArgs['builddir'] then
builddir = ScriptArgs['builddir']
end

targets = {client="teeworlds", server="teeworlds_srv",
targets = {client="chillerbot-h7", server="teeworlds_srv",
versionserver="versionsrv", masterserver="mastersrv",
tools="pseudo_tools"}

Expand Down
File renamed without changes.
File renamed without changes.
1 change: 1 addition & 0 deletions other/icons/chillerbot-h7.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ID ICON "chillerbot-h7.ico"
1 change: 1 addition & 0 deletions other/icons/chillerbot-h7_cl.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
50h ICON "chillerbot-h7.ico"
1 change: 1 addition & 0 deletions other/icons/chillerbot-h7_gcc.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ID ICON "chillerbot-h7.ico"
1 change: 0 additions & 1 deletion other/icons/teeworlds.rc

This file was deleted.

1 change: 0 additions & 1 deletion other/icons/teeworlds_cl.rc

This file was deleted.

1 change: 0 additions & 1 deletion other/icons/teeworlds_gcc.rc

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<assemblyIdentity version="1.0.0.0" name="teeworlds.exe"/>
<assemblyIdentity version="1.0.0.0" name="chillerbot-h7.exe"/>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
<security>
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">
Expand Down
2 changes: 2 additions & 0 deletions other/manifest/chillerbot-h7.rc
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#include "winuser.h"
1 RT_MANIFEST chillerbot-h7.manifest
2 changes: 0 additions & 2 deletions other/manifest/teeworlds.rc

This file was deleted.

0 comments on commit ecfc137

Please sign in to comment.