Revert "Changed binary names from bnetd to PvPGN/PvPGNConsole, d2cs to D2CS/D2CSConsole, and d2dbs to D2DBS/D2DBSConsole"

This reverts commit 51607568ac.
This commit is contained in:
RElesgoe 2018-07-29 06:13:43 -07:00
parent 51607568ac
commit b684ef9cff
3 changed files with 14 additions and 20 deletions

View file

@ -43,14 +43,12 @@ set(BNETD_GUI_RESOURCES
../win32/resource.h ../win32/resource.rc)
if(WITH_WIN32_GUI)
set(PVPGN_BIN_NAME "PvPGN")
add_executable(${PVPGN_BIN_NAME} WIN32 ${BNETD_SOURCES} ${BNETD_GUI_RESOURCES})
else(WITH_WIN32_GUI)
set(PVPGN_BIN_NAME "PvPGNConsole")
add_executable(${PVPGN_BIN_NAME} ${BNETD_SOURCES} ${BNETD_CONSOLE_RESOURCES})
add_executable(bnetd WIN32 ${BNETD_SOURCES} ${BNETD_GUI_RESOURCES})
else(WITH_WIN32_GUI)
add_executable(bnetd ${BNETD_SOURCES} ${BNETD_CONSOLE_RESOURCES})
endif(WITH_WIN32_GUI)
target_include_directories(${PVPGN_BIN_NAME}
target_include_directories(bnetd
PRIVATE
${ZLIB_INCLUDE_DIRS}
${LUA_INCLUDE_DIR}
@ -60,6 +58,6 @@ target_include_directories(${PVPGN_BIN_NAME}
${ODBC_INCLUDE_DIR}
)
target_link_libraries(${PVPGN_BIN_NAME} PRIVATE common compat fmt win32 ${NETWORK_LIBRARIES} ${ZLIB_LIBRARIES} ${MYSQL_LIBRARIES} ${SQLITE3_LIBRARIES} ${PGSQL_LIBRARIES} ${ODBC_LIBRARIES} ${LUA_LIBRARIES})
target_link_libraries(bnetd PRIVATE common compat fmt win32 ${NETWORK_LIBRARIES} ${ZLIB_LIBRARIES} ${MYSQL_LIBRARIES} ${SQLITE3_LIBRARIES} ${PGSQL_LIBRARIES} ${ODBC_LIBRARIES} ${LUA_LIBRARIES})
install(TARGETS ${PVPGN_BIN_NAME} DESTINATION ${SBINDIR})
install(TARGETS bnetd DESTINATION ${SBINDIR})

View file

@ -10,12 +10,10 @@ set(D2CS_SOURCES
../win32/d2cs_resource.h ../win32/d2cs_resource.rc)
if(WITH_WIN32_GUI)
set(D2CS_BIN_NAME "D2CS")
add_executable(${D2CS_BIN_NAME} WIN32 ${D2CS_SOURCES})
add_executable(d2cs WIN32 ${D2CS_SOURCES})
else(WITH_WIN32_GUI)
set(D2CS_BIN_NAME "D2CSConsole")
add_executable(${D2CS_BIN_NAME} ${D2CS_SOURCES})
add_executable(d2cs ${D2CS_SOURCES})
endif(WITH_WIN32_GUI)
target_link_libraries(${D2CS_BIN_NAME} PRIVATE common compat fmt win32 ${NETWORK_LIBRARIES})
install(TARGETS ${D2CS_BIN_NAME} DESTINATION ${SBINDIR})
target_link_libraries(d2cs PRIVATE common compat fmt win32 ${NETWORK_LIBRARIES})
install(TARGETS d2cs DESTINATION ${SBINDIR})

View file

@ -6,12 +6,10 @@ set(D2DBS_SOURCES
../win32/d2dbs_resource.rc)
if(WITH_WIN32_GUI)
set(D2DBS_BIN_NAME "D2DBS")
add_executable(${D2DBS_BIN_NAME} WIN32 ${D2DBS_SOURCES})
add_executable(d2dbs WIN32 ${D2DBS_SOURCES})
else(WITH_WIN32_GUI)
set(D2DBS_BIN_NAME "D2DBSConsole")
add_executable(${D2DBS_BIN_NAME} ${D2DBS_SOURCES})
add_executable(d2dbs ${D2DBS_SOURCES})
endif(WITH_WIN32_GUI)
target_link_libraries(${D2DBS_BIN_NAME} PRIVATE common compat fmt win32 ${NETWORK_LIBRARIES})
install(TARGETS ${D2DBS_BIN_NAME} DESTINATION ${SBINDIR})
target_link_libraries(d2dbs PRIVATE common compat fmt win32 ${NETWORK_LIBRARIES})
install(TARGETS d2dbs DESTINATION ${SBINDIR})