diff --git a/CMakeLists.txt b/CMakeLists.txt index 45b7d3b11f..950b0bfaa5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 @@ -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}") @@ -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) diff --git a/bam.lua b/bam.lua index 32abca2c25..fe29ba6c68 100644 --- a/bam.lua +++ b/bam.lua @@ -313,7 +313,7 @@ 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] @@ -321,7 +321,7 @@ 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 @@ -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) @@ -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"} diff --git a/other/icons/teeworlds.icns b/other/icons/chillerbot-h7.icns similarity index 100% rename from other/icons/teeworlds.icns rename to other/icons/chillerbot-h7.icns diff --git a/other/icons/teeworlds.ico b/other/icons/chillerbot-h7.ico similarity index 100% rename from other/icons/teeworlds.ico rename to other/icons/chillerbot-h7.ico diff --git a/other/icons/chillerbot-h7.rc b/other/icons/chillerbot-h7.rc new file mode 100644 index 0000000000..ea8b241105 --- /dev/null +++ b/other/icons/chillerbot-h7.rc @@ -0,0 +1 @@ +ID ICON "chillerbot-h7.ico" diff --git a/other/icons/chillerbot-h7_cl.rc b/other/icons/chillerbot-h7_cl.rc new file mode 100644 index 0000000000..ba9f8a9718 --- /dev/null +++ b/other/icons/chillerbot-h7_cl.rc @@ -0,0 +1 @@ +50h ICON "chillerbot-h7.ico" diff --git a/other/icons/chillerbot-h7_gcc.rc b/other/icons/chillerbot-h7_gcc.rc new file mode 100644 index 0000000000..ea8b241105 --- /dev/null +++ b/other/icons/chillerbot-h7_gcc.rc @@ -0,0 +1 @@ +ID ICON "chillerbot-h7.ico" diff --git a/other/icons/teeworlds.rc b/other/icons/teeworlds.rc deleted file mode 100644 index aa5dcb44fe..0000000000 --- a/other/icons/teeworlds.rc +++ /dev/null @@ -1 +0,0 @@ -ID ICON "teeworlds.ico" diff --git a/other/icons/teeworlds_cl.rc b/other/icons/teeworlds_cl.rc deleted file mode 100644 index a4eab1f955..0000000000 --- a/other/icons/teeworlds_cl.rc +++ /dev/null @@ -1 +0,0 @@ -50h ICON "teeworlds.ico" diff --git a/other/icons/teeworlds_gcc.rc b/other/icons/teeworlds_gcc.rc deleted file mode 100644 index aa5dcb44fe..0000000000 --- a/other/icons/teeworlds_gcc.rc +++ /dev/null @@ -1 +0,0 @@ -ID ICON "teeworlds.ico" diff --git a/other/manifest/teeworlds.manifest b/other/manifest/chillerbot-h7.manifest similarity index 94% rename from other/manifest/teeworlds.manifest rename to other/manifest/chillerbot-h7.manifest index 8b4ee345f9..2377f2c72f 100644 --- a/other/manifest/teeworlds.manifest +++ b/other/manifest/chillerbot-h7.manifest @@ -1,6 +1,6 @@ - + diff --git a/other/manifest/chillerbot-h7.rc b/other/manifest/chillerbot-h7.rc new file mode 100644 index 0000000000..b07de02a5b --- /dev/null +++ b/other/manifest/chillerbot-h7.rc @@ -0,0 +1,2 @@ +#include "winuser.h" +1 RT_MANIFEST chillerbot-h7.manifest diff --git a/other/manifest/teeworlds.rc b/other/manifest/teeworlds.rc deleted file mode 100644 index 0bf26c1d63..0000000000 --- a/other/manifest/teeworlds.rc +++ /dev/null @@ -1,2 +0,0 @@ -#include "winuser.h" -1 RT_MANIFEST teeworlds.manifest