Skip to content

Commit 5e3f4a2

Browse files
author
Topaz
committed
New icons for a new future
1 parent 3eb1c15 commit 5e3f4a2

23 files changed

+77
-74
lines changed

‎.gitignore

+3-3
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ UpgradeLog*.XML
126126
*.app
127127

128128
# Generated executables
129-
/tpzconnect
130-
/tpzgame
131-
/tpzsearch
129+
/topaz-connect
130+
/topaz-game
131+
/topaz-search
132132

133133
# Generated files, mostly autotools-related
134134
.deps

‎CMakeSettings.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
// See https://go.microsoft.com//fwlink//?linkid=834763 for more information about this file.
32
"environments": [
43
{
54
"BuildDir": "${workspaceRoot}\\build\\${name}",
@@ -50,6 +49,10 @@
5049
"cmakeCommandArgs": "",
5150
"buildCommandArgs": "-v:detailed",
5251
"ctestCommandArgs": ""
52+
},
53+
{
54+
"name": "topaz",
55+
"cacheRoot": "C:\\Games\\FFXI\\Topaz\\build\\x86-Debug"
5356
}
5457
]
55-
}
58+
}

‎Makefile.am

+19-19
Original file line numberDiff line numberDiff line change
@@ -46,25 +46,25 @@ LDFLAGS_ALL += -pagezero_size 10000 -image_base 100000000
4646
endif
4747

4848
## Targets
49-
bin_PROGRAMS = tpzgame tpzconnect tpzsearch
49+
bin_PROGRAMS = topaz-game topaz-connect topaz-search
5050

51-
tpzgame_SOURCES = $(SRC_ALL) $(SRC_MAP)
52-
tpzgame_CXXFLAGS = $(CFLAGS_ALL) $(CXXFLAGS_ALL)
53-
tpzgame_CPPFLAGS = $(CPPFLAGS_ALL)
54-
tpzgame_CFLAGS = $(CFLAGS_ALL)
55-
tpzgame_LDFLAGS = $(LDFLAGS_ALL)
56-
tpzgame_LDADD = $(LIBS_ALL)
51+
topaz-game_SOURCES = $(SRC_ALL) $(SRC_MAP)
52+
topaz-game_CXXFLAGS = $(CFLAGS_ALL) $(CXXFLAGS_ALL)
53+
topaz-game_CPPFLAGS = $(CPPFLAGS_ALL)
54+
topaz-game_CFLAGS = $(CFLAGS_ALL)
55+
topaz-game_LDFLAGS = $(LDFLAGS_ALL)
56+
topaz-game_LDADD = $(LIBS_ALL)
5757

58-
tpzconnect_SOURCES = $(SRC_ALL) $(SRC_LOGIN)
59-
tpzconnect_CXXFLAGS = $(CFLAGS_ALL) $(CXXFLAGS_ALL)
60-
tpzconnect_CPPFLAGS = $(CPPFLAGS_ALL)
61-
tpzconnect_CFLAGS = $(CFLAGS_ALL)
62-
tpzconnect_LDFLAGS = $(LDFLAGS_ALL)
63-
tpzconnect_LDADD = $(LIBS_ALL)
58+
topaz-connect_SOURCES = $(SRC_ALL) $(SRC_LOGIN)
59+
topaz-connect_CXXFLAGS = $(CFLAGS_ALL) $(CXXFLAGS_ALL)
60+
topaz-connect_CPPFLAGS = $(CPPFLAGS_ALL)
61+
topaz-connect_CFLAGS = $(CFLAGS_ALL)
62+
topaz-connect_LDFLAGS = $(LDFLAGS_ALL)
63+
topaz-connect_LDADD = $(LIBS_ALL)
6464

65-
tpzsearch_SOURCES = $(SRC_SEARCH_COMMON) $(SRC_SEARCH)
66-
tpzsearch_CXXFLAGS = $(CFLAGS_ALL) $(CXXFLAGS_ALL)
67-
tpzsearch_CPPFLAGS = $(CPPFLAGS_ALL)
68-
tpzsearch_CFLAGS = $(CFLAGS_ALL)
69-
tpzsearch_LDFLAGS = $(LDFLAGS_ALL)
70-
tpzsearch_LDADD = $(LIBS_ALL)
65+
topaz-search_SOURCES = $(SRC_SEARCH_COMMON) $(SRC_SEARCH)
66+
topaz-search_CXXFLAGS = $(CFLAGS_ALL) $(CXXFLAGS_ALL)
67+
topaz-search_CPPFLAGS = $(CPPFLAGS_ALL)
68+
topaz-search_CFLAGS = $(CFLAGS_ALL)
69+
topaz-search_LDFLAGS = $(LDFLAGS_ALL)
70+
topaz-search_LDADD = $(LIBS_ALL)

‎gensources.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/bin/bash
2-
for line in `grep -e "Cl.*Include=\"\." win32/vcxproj/TPZGame*proj | tr -d " \"\" \"\/\>\r" | cut -c25- | sed 's:\\\:\/:g' `; do echo -n "${line} \\"; echo; done > game.sources
2+
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
33

44
echo SRC_COMMON = \\ > sources.am
55
cat game.sources | grep src/common/ | sed '$s/.$//' >> sources.am
@@ -9,13 +9,13 @@ echo SRC_MAP = \\ >> sources.am
99
cat game.sources | grep src/map/ | sed '$s/.$//' >> sources.am
1010
echo "" >> sources.am
1111

12-
for line in `grep -e "Cl.*Include=\"\." win32/vcxproj/TPZConnect*proj | tr -d " \"\/\>\r" | cut -c25- | sed 's:\\\:\/:g' `; do echo -n "${line} \\"; echo; done > connect.sources
12+
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
1313

1414
echo SRC_LOGIN = \\ >> sources.am
1515
cat connect.sources | grep src/login/ | sed '$s/.$//' >> sources.am
1616
echo "" >> sources.am
1717

18-
for line in `grep -e "Cl.*Include=\"\." win32/vcxproj/tpzsearch*proj | tr -d " \"\/\>\r" | cut -c25- | sed 's:\\\:\/:g' `; do echo -n "${line} \\"; echo; done > search.sources
18+
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
1919

2020
echo SRC_SEARCH_COMMON = \\ >> sources.am
2121
cat search.sources | grep src/common/ | sed '$s/.$//' >> sources.am

‎icons/connectserver.ico

-46.2 KB
Binary file not shown.

‎icons/gameserver.ico

18.8 KB
Binary file not shown.

‎icons/searchserver.ico

-44.7 KB
Binary file not shown.

‎src/login/CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ else()
1515
endif()
1616

1717

18-
add_executable(TPZConnect-server
18+
add_executable(topaz-connect
1919
${GENERATED_SOURCES}
2020
../common/blowfish.cpp
2121
../common/kernel.cpp
@@ -30,27 +30,27 @@ add_executable(TPZConnect-server
3030
${resource}
3131
)
3232

33-
set_target_properties(TPZConnect-server PROPERTIES OUTPUT_NAME TPZConnect-server${spacer}${platform_suffix})
33+
set_target_properties(topaz-connect PROPERTIES OUTPUT_NAME topaz-connect${spacer}${platform_suffix})
3434

3535
if(UNIX)
36-
target_include_directories(TPZConnect-server PRIVATE
36+
target_include_directories(topaz-connect PRIVATE
3737
${MYSQLCLIENT_INCLUDE_DIRS}
3838
)
3939

40-
target_link_libraries(TPZConnect-server
40+
target_link_libraries(topaz-connect
4141
${MYSQLCLIENT_LIBRARIES}
4242
${ZMQ_LIBRARIES}
4343
${CMAKE_THREAD_LIBS_INIT}
4444
)
4545
else()
46-
target_include_directories(TPZConnect-server PRIVATE
46+
target_include_directories(topaz-connect PRIVATE
4747
../common
4848
../../win32/external
4949
../../win32/external/mysql
5050
../../win32/external/zmq
5151
)
5252

53-
target_link_libraries(TPZConnect-server
53+
target_link_libraries(topaz-connect
5454
libmariadb${platform_suffix}
5555
libzmq${lib_debug}${spacer}${platform_suffix}
5656
WS2_32

‎src/map/CMakeLists.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ else()
1414
set(resource "../../win32/vcxproj/gameserver.rc")
1515
endif()
1616

17-
add_executable(TPZGame-server
17+
add_executable(topaz-game
1818
${GENERATED_SOURCES}
1919
../common/blowfish.cpp
2020
../common/detour/DetourAlloc.cpp
@@ -35,32 +35,32 @@ add_executable(TPZGame-server
3535
${resource}
3636
)
3737

38-
set_target_properties(TPZGame-server PROPERTIES OUTPUT_NAME TPZGame-server${spacer}${platform_suffix})
38+
set_target_properties(topaz-game PROPERTIES OUTPUT_NAME topaz-game${spacer}${platform_suffix})
3939

4040
if(UNIX)
41-
target_include_directories(TPZGame-server PRIVATE
41+
target_include_directories(topaz-game PRIVATE
4242
${MYSQLCLIENT_INCLUDE_DIRS}
4343
${LUAJIT_INCLUDE_DIRS}
4444
)
45-
target_link_libraries(TPZGame-server
45+
target_link_libraries(topaz-game
4646
${MYSQLCLIENT_LIBRARIES}
4747
${ZMQ_LIBRARIES}
4848
${LUAJIT_LIBRARIES}
4949
${CMAKE_THREAD_LIBS_INIT}
5050
)
5151

5252
if(APPLE)
53-
target_link_options(TPZGame-server PUBLIC -pagezero_size 10000 -image_base 100000000)
53+
target_link_options(topaz-game PUBLIC -pagezero_size 10000 -image_base 100000000)
5454
endif()
5555
else()
56-
target_include_directories(TPZGame-server PRIVATE
56+
target_include_directories(topaz-game PRIVATE
5757
../common
5858
../../win32/external
5959
../../win32/external/mysql
6060
../../win32/external/zmq
6161
)
6262

63-
target_link_libraries(TPZGame-server
63+
target_link_libraries(topaz-game
6464
libmariadb${platform_suffix}
6565
lua51${spacer}${platform_suffix}
6666
libzmq${lib_debug}${spacer}${platform_suffix}

‎src/search/CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ else()
1313
set(resource "../../win32/vcxproj/searchserver.rc")
1414
endif()
1515

16-
add_executable(TPZSearch-server
16+
add_executable(topaz-search
1717
${GENERATED_SOURCES}
1818
../common/blowfish.cpp
1919
../common/md52.cpp
@@ -25,25 +25,25 @@ add_executable(TPZSearch-server
2525
${resource}
2626
)
2727

28-
set_target_properties(TPZSearch-server PROPERTIES OUTPUT_NAME TPZSearch-server${spacer}${platform_suffix})
28+
set_target_properties(topaz-search PROPERTIES OUTPUT_NAME topaz-search${spacer}${platform_suffix})
2929

3030
if(UNIX)
31-
target_include_directories(TPZSearch-server PRIVATE
31+
target_include_directories(topaz-search PRIVATE
3232
${MYSQLCLIENT_INCLUDE_DIRS}
3333
)
3434

35-
target_link_libraries(TPZSearch-server
35+
target_link_libraries(topaz-search
3636
${MYSQLCLIENT_LIBRARIES}
3737
${ZMQ_LIBRARIES}
3838
${CMAKE_THREAD_LIBS_INIT}
3939
)
4040
else()
41-
target_include_directories(TPZSearch-server PRIVATE
41+
target_include_directories(topaz-search PRIVATE
4242
../common
4343
../../win32/external
4444
../../win32/external/mysql
4545
)
46-
target_link_libraries(TPZSearch-server
46+
target_link_libraries(topaz-search
4747
libmariadb${platform_suffix}
4848
WS2_32
4949
)

‎src/search/search.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ int32 main(int32 argc, char **argv)
256256
}
257257

258258
ShowMessage(CL_WHITE"========================================================\n\n" CL_RESET);
259-
ShowMessage(CL_WHITE"TPZSearch-server\n\n");
259+
ShowMessage(CL_WHITE"topaz-search\n\n");
260260
ShowMessage(CL_WHITE"========================================================\n\n" CL_RESET);
261261
if (search_config.expire_auctions == 1) {
262262
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)
315315

316316
/************************************************************************
317317
* *
318-
* TPZSearch-Server default config *
318+
* topaz-search default config *
319319
* *
320320
************************************************************************/
321321

@@ -333,7 +333,7 @@ void search_config_default()
333333

334334
/************************************************************************
335335
* *
336-
* TPZSearch-Server config *
336+
* topaz-search config *
337337
* *
338338
************************************************************************/
339339

‎win32/topaz.sln

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 16 2019
44
VisualStudioVersion = 16.3.29519.87
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TPZConnect-server", "vcxproj\TPZConnect-server.vcxproj", "{E50EB22C-08C8-4FDA-91AD-DE5062AF5619}"
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "topaz-connect", "vcxproj\topaz-connect.vcxproj", "{E50EB22C-08C8-4FDA-91AD-DE5062AF5619}"
77
EndProject
8-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TPZGame-server", "vcxproj\TPZGame-server.vcxproj", "{89A19910-84DB-454D-9C7F-0A47A293867B}"
8+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "topaz-game", "vcxproj\topaz-game.vcxproj", "{89A19910-84DB-454D-9C7F-0A47A293867B}"
99
EndProject
10-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TPZSearch-server", "vcxproj\TPZSearch-server.vcxproj", "{5C763F9B-F332-434F-9EE6-B64B15E1E520}"
10+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "topaz-search", "vcxproj\topaz-search.vcxproj", "{5C763F9B-F332-434F-9EE6-B64B15E1E520}"
1111
EndProject
1212
Global
1313
GlobalSection(SolutionConfigurationPlatforms) = preSolution

‎win32/vcxproj/Debug.props

+9-9
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<SubSystem>Console</SubSystem>
1616
</Link>
1717
</ItemDefinitionGroup>
18-
<ItemDefinitionGroup Condition="'$(ProjectName)'=='TPZGame-server'">
18+
<ItemDefinitionGroup Condition="'$(ProjectName)'=='topaz-game'">
1919
<ClCompile>
2020
<PrecompiledHeader>
2121
</PrecompiledHeader>
@@ -29,7 +29,7 @@
2929
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
3030
</ClCompile>
3131
</ItemDefinitionGroup>
32-
<ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='TPZGame-server|Win32'">
32+
<ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='topaz-game|Win32'">
3333
<Link>
3434
<AdditionalDependencies>libmariadb.lib;lua51.lib;libzmq-d.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
3535
<OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
@@ -40,7 +40,7 @@
4040
<ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
4141
</Link>
4242
</ItemDefinitionGroup>
43-
<ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='TPZGame-server|x64'">
43+
<ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='topaz-game|x64'">
4444
<Link>
4545
<AdditionalDependencies>libmariadb64.lib;lua51_64.lib;libzmq-d_64.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
4646
<OutputFile>$(OutDir)$(ProjectName)_64$(TargetExt)</OutputFile>
@@ -49,7 +49,7 @@
4949
<ProgramDatabaseFile>$(TargetDir)$(TargetName).pdb</ProgramDatabaseFile>
5050
</Link>
5151
</ItemDefinitionGroup>
52-
<ItemDefinitionGroup Condition="'$(ProjectName)'=='TPZConnect-server'">
52+
<ItemDefinitionGroup Condition="'$(ProjectName)'=='topaz-connect'">
5353
<ClCompile>
5454
<PrecompiledHeader>
5555
</PrecompiledHeader>
@@ -58,23 +58,23 @@
5858
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;dsTCPSERV;DEBUGLOGLOGIN;%(PreprocessorDefinitions)</PreprocessorDefinitions>
5959
</ClCompile>
6060
</ItemDefinitionGroup>
61-
<ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='TPZConnect-server|Win32'">
61+
<ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='topaz-connect|Win32'">
6262
<Link>
6363
<AdditionalDependencies>libmariadb.lib;libzmq.lib;WS2_32.Lib</AdditionalDependencies>
6464
<AdditionalLibraryDirectories>..\..\lib</AdditionalLibraryDirectories>
6565
<GenerateDebugInformation>true</GenerateDebugInformation>
6666
<OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
6767
</Link>
6868
</ItemDefinitionGroup>
69-
<ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='TPZConnect-server|x64'">
69+
<ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='topaz-connect|x64'">
7070
<Link>
7171
<AdditionalDependencies>libmariadb64.lib;libzmq-d_64.lib;WS2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
7272
<AdditionalLibraryDirectories>..\..\lib64</AdditionalLibraryDirectories>
7373
<GenerateDebugInformation>true</GenerateDebugInformation>
7474
<OutputFile>$(OutDir)$(ProjectName)_64$(TargetExt)</OutputFile>
7575
</Link>
7676
</ItemDefinitionGroup>
77-
<ItemDefinitionGroup Condition="'$(ProjectName)'=='TPZSearch-server'">
77+
<ItemDefinitionGroup Condition="'$(ProjectName)'=='topaz-search'">
7878
<ClCompile>
7979
<PrecompiledHeader>
8080
</PrecompiledHeader>
@@ -83,15 +83,15 @@
8383
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8484
</ClCompile>
8585
</ItemDefinitionGroup>
86-
<ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='TPZSearch-server|Win32'">
86+
<ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='topaz-search|Win32'">
8787
<Link>
8888
<AdditionalDependencies>libmariadb.lib;WS2_32.Lib;</AdditionalDependencies>
8989
<AdditionalLibraryDirectories>..\..\lib</AdditionalLibraryDirectories>
9090
<GenerateDebugInformation>true</GenerateDebugInformation>
9191
<OutputFile>$(OutDir)$(ProjectName)$(TargetExt)</OutputFile>
9292
</Link>
9393
</ItemDefinitionGroup>
94-
<ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='TPZSearch-server|x64'">
94+
<ItemDefinitionGroup Condition="'$(ProjectName)|$(Platform)'=='topaz-search|x64'">
9595
<Link>
9696
<AdditionalDependencies>libmariadb64.lib;WS2_32.Lib;</AdditionalDependencies>
9797
<AdditionalLibraryDirectories>..\..\lib64</AdditionalLibraryDirectories>

0 commit comments

Comments
 (0)