Some fixes for illegal symbols that were introduced into make when removing previous branding

Author: Topaz

.gitignore

@@ -126,9 +126,9 @@ UpgradeLog*.XML
 *.app
 
 # Generated executables
-/topaz-connect
-/topaz-game
-/topaz-search
+/topaz_connect
+/topaz_game
+/topaz_search
 
 # Generated files, mostly autotools-related
 .deps

Makefile.am

@@ -46,25 +46,25 @@ LDFLAGS_ALL             += -pagezero_size 10000 -image_base 100000000
 endif
 
 ## Targets
-bin_PROGRAMS          = topaz-game topaz-connect topaz-search
+bin_PROGRAMS          = topaz_game topaz_connect topaz_search
 
-topaz-game_SOURCES        = $(SRC_ALL) $(SRC_MAP)
-topaz-game_CXXFLAGS       = $(CFLAGS_ALL) $(CXXFLAGS_ALL)
-topaz-game_CPPFLAGS       = $(CPPFLAGS_ALL)
-topaz-game_CFLAGS         = $(CFLAGS_ALL)
-topaz-game_LDFLAGS        = $(LDFLAGS_ALL)
-topaz-game_LDADD          = $(LIBS_ALL)
+topaz_game_SOURCES        = $(SRC_ALL) $(SRC_MAP)
+topaz_game_CXXFLAGS       = $(CFLAGS_ALL) $(CXXFLAGS_ALL)
+topaz_game_CPPFLAGS       = $(CPPFLAGS_ALL)
+topaz_game_CFLAGS         = $(CFLAGS_ALL)
+topaz_game_LDFLAGS        = $(LDFLAGS_ALL)
+topaz_game_LDADD          = $(LIBS_ALL)
 
-topaz-connect_SOURCES     = $(SRC_ALL) $(SRC_LOGIN)
-topaz-connect_CXXFLAGS    = $(CFLAGS_ALL) $(CXXFLAGS_ALL)
-topaz-connect_CPPFLAGS    = $(CPPFLAGS_ALL)
-topaz-connect_CFLAGS      = $(CFLAGS_ALL)
-topaz-connect_LDFLAGS     = $(LDFLAGS_ALL)
-topaz-connect_LDADD       = $(LIBS_ALL)
+topaz_connect_SOURCES     = $(SRC_ALL) $(SRC_LOGIN)
+topaz_connect_CXXFLAGS    = $(CFLAGS_ALL) $(CXXFLAGS_ALL)
+topaz_connect_CPPFLAGS    = $(CPPFLAGS_ALL)
+topaz_connect_CFLAGS      = $(CFLAGS_ALL)
+topaz_connect_LDFLAGS     = $(LDFLAGS_ALL)
+topaz_connect_LDADD       = $(LIBS_ALL)
 
-topaz-search_SOURCES     = $(SRC_SEARCH_COMMON) $(SRC_SEARCH)
-topaz-search_CXXFLAGS    = $(CFLAGS_ALL) $(CXXFLAGS_ALL)
-topaz-search_CPPFLAGS    = $(CPPFLAGS_ALL)
-topaz-search_CFLAGS      = $(CFLAGS_ALL)
-topaz-search_LDFLAGS     = $(LDFLAGS_ALL)
-topaz-search_LDADD       = $(LIBS_ALL)
+topaz_search_SOURCES     = $(SRC_SEARCH_COMMON) $(SRC_SEARCH)
+topaz_search_CXXFLAGS    = $(CFLAGS_ALL) $(CXXFLAGS_ALL)
+topaz_search_CPPFLAGS    = $(CPPFLAGS_ALL)
+topaz_search_CFLAGS      = $(CFLAGS_ALL)
+topaz_search_LDFLAGS     = $(LDFLAGS_ALL)
+topaz_search_LDADD       = $(LIBS_ALL)

appveyor.yml

@@ -1,7 +1,7 @@
 version: 0.9.{build}
 pull_requests:
   do_not_increment_build_number: true
-image: Visual Studio 16 2019
+image: Visual Studio 2019
 configuration:
  - Debug
  - Release

gensources.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
-for line in `grep -e "Cl.*Include=\"\." win32/vcxproj/topaz-game*proj | tr -d " \"\" \"\/\>\r" | cut -c25- | sed 's:\\\:\/:g' `; do echo -n "${line} \\"; echo; done > game.sources
+for line in `grep -e "Cl.*Include=\"\." win32/vcxproj/topaz_game*proj | tr -d " \"\" \"\/\>\r" | cut -c25- | sed 's:\\\:\/:g' `; do echo -n "${line} \\"; echo; done > game.sources
 
 echo SRC_COMMON = \\ > sources.am
 cat game.sources | grep src/common/ | sed '$s/.$//' >> sources.am
@@ -9,13 +9,13 @@ echo SRC_MAP = \\ >> sources.am
 cat game.sources | grep src/map/ | sed '$s/.$//' >> sources.am
 echo "" >> sources.am
 
-for line in `grep -e "Cl.*Include=\"\." win32/vcxproj/topaz-connect*proj | tr -d " \"\/\>\r" | cut -c25- | sed 's:\\\:\/:g' `; do echo -n "${line} \\"; echo; done > connect.sources
+for line in `grep -e "Cl.*Include=\"\." win32/vcxproj/topaz_connect*proj | tr -d " \"\/\>\r" | cut -c25- | sed 's:\\\:\/:g' `; do echo -n "${line} \\"; echo; done > connect.sources
 
 echo SRC_LOGIN = \\ >> sources.am
 cat connect.sources | grep src/login/ | sed '$s/.$//' >> sources.am
 echo "" >> sources.am
 
-for line in `grep -e "Cl.*Include=\"\." win32/vcxproj/topaz-search*proj | tr -d " \"\/\>\r" | cut -c25- | sed 's:\\\:\/:g' `; do echo -n "${line} \\"; echo; done > search.sources
+for line in `grep -e "Cl.*Include=\"\." win32/vcxproj/topaz_search*proj | tr -d " \"\/\>\r" | cut -c25- | sed 's:\\\:\/:g' `; do echo -n "${line} \\"; echo; done > search.sources
 
 echo SRC_SEARCH_COMMON = \\ >> sources.am
 cat search.sources | grep src/common/ | sed '$s/.$//' >> sources.am

src/login/CMakeLists.txt

@@ -15,7 +15,7 @@ else()
 endif()
 
 
-add_executable(topaz-connect
+add_executable(topaz_connect
     ${GENERATED_SOURCES}
     ../common/blowfish.cpp
     ../common/kernel.cpp
@@ -30,27 +30,27 @@ add_executable(topaz-connect
     ${resource}
 )
 
-set_target_properties(topaz-connect PROPERTIES OUTPUT_NAME topaz-connect${spacer}${platform_suffix})
+set_target_properties(topaz_connect PROPERTIES OUTPUT_NAME topaz_connect${spacer}${platform_suffix})
 
 if(UNIX)
-    target_include_directories(topaz-connect PRIVATE
+    target_include_directories(topaz_connect PRIVATE
         ${MYSQLCLIENT_INCLUDE_DIRS}
     )
 
-    target_link_libraries(topaz-connect
+    target_link_libraries(topaz_connect
         ${MYSQLCLIENT_LIBRARIES}
         ${ZMQ_LIBRARIES}
         ${CMAKE_THREAD_LIBS_INIT}
     )
 else()
-    target_include_directories(topaz-connect PRIVATE
+    target_include_directories(topaz_connect PRIVATE
         ../common
         ../../win32/external
         ../../win32/external/mysql
         ../../win32/external/zmq
     )
 
-    target_link_libraries(topaz-connect
+    target_link_libraries(topaz_connect
         libmariadb${platform_suffix}
         libzmq${lib_debug}${spacer}${platform_suffix}
         WS2_32

src/map/CMakeLists.txt

@@ -14,7 +14,7 @@ else()
     set(resource "../../win32/vcxproj/gameserver.rc")
 endif()
 
-add_executable(topaz-game
+add_executable(topaz_game
     ${GENERATED_SOURCES}
     ../common/blowfish.cpp
     ../common/detour/DetourAlloc.cpp
@@ -35,32 +35,32 @@ add_executable(topaz-game
     ${resource}
 )
 
-set_target_properties(topaz-game PROPERTIES OUTPUT_NAME topaz-game${spacer}${platform_suffix})
+set_target_properties(topaz_game PROPERTIES OUTPUT_NAME topaz_game${spacer}${platform_suffix})
 
 if(UNIX)
-    target_include_directories(topaz-game PRIVATE
+    target_include_directories(topaz_game PRIVATE
         ${MYSQLCLIENT_INCLUDE_DIRS}
         ${LUAJIT_INCLUDE_DIRS}
     )
-    target_link_libraries(topaz-game
+    target_link_libraries(topaz_game
         ${MYSQLCLIENT_LIBRARIES}
         ${ZMQ_LIBRARIES}
         ${LUAJIT_LIBRARIES}
         ${CMAKE_THREAD_LIBS_INIT}
     )
 
     if(APPLE)
-        target_link_options(topaz-game PUBLIC -pagezero_size 10000 -image_base 100000000)
+        target_link_options(topaz_game PUBLIC -pagezero_size 10000 -image_base 100000000)
     endif()
 else()
-    target_include_directories(topaz-game PRIVATE
+    target_include_directories(topaz_game PRIVATE
         ../common
         ../../win32/external
         ../../win32/external/mysql
         ../../win32/external/zmq
     )
 
-    target_link_libraries(topaz-game
+    target_link_libraries(topaz_game
         libmariadb${platform_suffix}
         lua51${spacer}${platform_suffix}
         libzmq${lib_debug}${spacer}${platform_suffix}

src/search/CMakeLists.txt

@@ -13,7 +13,7 @@ else()
     set(resource "../../win32/vcxproj/searchserver.rc")
 endif()
 
-add_executable(topaz-search
+add_executable(topaz_search
     ${GENERATED_SOURCES}
     ../common/blowfish.cpp
     ../common/md52.cpp
@@ -25,25 +25,25 @@ add_executable(topaz-search
     ${resource}
 )
 
-set_target_properties(topaz-search PROPERTIES OUTPUT_NAME topaz-search${spacer}${platform_suffix})
+set_target_properties(topaz_search PROPERTIES OUTPUT_NAME topaz_search${spacer}${platform_suffix})
 
 if(UNIX)
-    target_include_directories(topaz-search PRIVATE
+    target_include_directories(topaz_search PRIVATE
         ${MYSQLCLIENT_INCLUDE_DIRS}
     )
 
-    target_link_libraries(topaz-search
+    target_link_libraries(topaz_search
         ${MYSQLCLIENT_LIBRARIES}
         ${ZMQ_LIBRARIES}
         ${CMAKE_THREAD_LIBS_INIT}
     )
 else()
-    target_include_directories(topaz-search PRIVATE
+    target_include_directories(topaz_search PRIVATE
         ../common
         ../../win32/external
         ../../win32/external/mysql
     )
-    target_link_libraries(topaz-search
+    target_link_libraries(topaz_search
         libmariadb${platform_suffix}
         WS2_32
     )

src/search/search.cpp

@@ -256,7 +256,7 @@ int32 main(int32 argc, char **argv)
     }
 
     ShowMessage(CL_WHITE"========================================================\n\n" CL_RESET);
-    ShowMessage(CL_WHITE"topaz-search\n\n");
+    ShowMessage(CL_WHITE"topaz_search\n\n");
     ShowMessage(CL_WHITE"========================================================\n\n" CL_RESET);
     if (search_config.expire_auctions == 1) {
         ShowMessage(CL_GREEN"AH task to return items older than %u days is running\n" CL_RESET, search_config.expire_days);
@@ -315,7 +315,7 @@ int32 main(int32 argc, char **argv)
 
 /************************************************************************
 *                                                                       *
-*  topaz-search default config                                       *
+*  topaz_search default config                                       *
 *                                                                       *
 ************************************************************************/
 
@@ -333,7 +333,7 @@ void search_config_default()
 
 /************************************************************************
 *                                                                       *
-*  topaz-search config                                               *
+*  topaz_search config                                               *
 *                                                                       *
 ************************************************************************/
 

win32/topaz.sln

@@ -1,13 +1,13 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 16 2019
+# Visual Studio Version 16
 VisualStudioVersion = 16.3.29519.87
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "topaz-connect", "vcxproj\topaz-connect.vcxproj", "{E50EB22C-08C8-4FDA-91AD-DE5062AF5619}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "topaz_connect", "vcxproj\topaz_connect.vcxproj", "{E50EB22C-08C8-4FDA-91AD-DE5062AF5619}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "topaz-game", "vcxproj\topaz-game.vcxproj", "{89A19910-84DB-454D-9C7F-0A47A293867B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "topaz_game", "vcxproj\topaz_game.vcxproj", "{89A19910-84DB-454D-9C7F-0A47A293867B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "topaz-search", "vcxproj\topaz-search.vcxproj", "{5C763F9B-F332-434F-9EE6-B64B15E1E520}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "topaz_search", "vcxproj\topaz_search.vcxproj", "{5C763F9B-F332-434F-9EE6-B64B15E1E520}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

win32/vcxproj/Debug.props

@@ -15,7 +15,7 @@
       <SubSystem>Console</SubSystem>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(ProjectName)'=='topaz-game'">
+  <ItemDefinitionGroup Condition="'$(ProjectName)'=='topaz_game'">
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -29,7 +29,7 @@
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='topaz-game|Win32'">
+  <ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='topaz_game|Win32'">
     <Link>
       <AdditionalDependencies>libmariadb.lib;lua51.lib;libzmq-d.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
@@ -40,7 +40,7 @@
       <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='topaz-game|x64'">
+  <ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='topaz_game|x64'">
     <Link>
       <AdditionalDependencies>libmariadb64.lib;lua51_64.lib;libzmq-d_64.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>$(OutDir)$(ProjectName)_64$(TargetExt)</OutputFile>
@@ -49,7 +49,7 @@
       <ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(ProjectName)'=='topaz-connect'">
+  <ItemDefinitionGroup Condition="'$(ProjectName)'=='topaz_connect'">
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -58,23 +58,23 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;dsTCPSERV;DEBUGLOGLOGIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='topaz-connect|Win32'">
+  <ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='topaz_connect|Win32'">
     <Link>
       <AdditionalDependencies>libmariadb.lib;libzmq.lib;WS2_32.Lib</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\lib</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='topaz-connect|x64'">
+  <ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='topaz_connect|x64'">
     <Link>
       <AdditionalDependencies>libmariadb64.lib;libzmq-d_64.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\lib64</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)$(ProjectName)_64$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(ProjectName)'=='topaz-search'">
+  <ItemDefinitionGroup Condition="'$(ProjectName)'=='topaz_search'">
     <ClCompile>
       <PrecompiledHeader>
       </PrecompiledHeader>
@@ -83,15 +83,15 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='topaz-search|Win32'">
+  <ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='topaz_search|Win32'">
     <Link>
       <AdditionalDependencies>libmariadb.lib;WS2_32.Lib;</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\lib</AdditionalLibraryDirectories>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
     </Link>
   </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='topaz-search|x64'">
+  <ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='topaz_search|x64'">
     <Link>
       <AdditionalDependencies>libmariadb64.lib;WS2_32.Lib;</AdditionalDependencies>
       <AdditionalLibraryDirectories>..\..\lib64</AdditionalLibraryDirectories>