Browse Source

A few minor tweaks (apparently the -DCLIENT is not needed, and is ignored by plVault anyway :( )

(cherry picked from commit ff1320388e)
rarified/huru-merge-work/cmake-building
Zrax 13 years ago committed by rarified
parent
commit
27e7a1cda9
  1. 4
      CMakeLists.txt
  2. 2
      Sources/Plasma/NucleusLib/CMakeLists.txt
  3. 4
      Sources/Plasma/NucleusLib/pnAsyncCore/CMakeLists.txt

4
CMakeLists.txt

@ -20,10 +20,6 @@ set(PLASMA_TARGETS Client
set_property(CACHE PLASMA_TARGETS PROPERTY STRINGS
"Client" "Server" "Patcher" "Ethereal" "NoAvMsgs")
if(PLASMA_TARGETS STREQUAL "Client")
add_definitions(-DCLIENT)
endif(PLASMA_TARGETS STREQUAL "Client")
if(PLASMA_TARGETS STREQUAL "Patcher")
add_definitions(-DPATCHER)
endif(PLASMA_TARGETS STREQUAL "Patcher")

2
Sources/Plasma/NucleusLib/CMakeLists.txt

@ -1,3 +1,5 @@
add_definitions(-D_LIB)
add_subdirectory(pnAddrInfo)
add_subdirectory(pnAsyncCore)
add_subdirectory(pnAsyncCoreExe)

4
Sources/Plasma/NucleusLib/pnAsyncCore/CMakeLists.txt

@ -3,10 +3,10 @@ include_directories(../../NucleusLib)
set(pnAsyncCore_HEADERS
Pch.h
pnAsyncCore.h
)
set(pnAsyncCore_PRIVATE
pnAsyncCore.h
Private/pnAcAllIncludes.h
Private/pnAcCore.h
Private/pnAcIo.h
@ -19,4 +19,4 @@ set(pnAsyncCore_PRIVATE
add_library(pnAsyncCore STATIC ${pnAsyncCore_PRIVATE} ${pnAsyncCore_HEADERS})
source_group("Header Files" FILES ${pnAsyncCore_HEADERS})
source_group("Private" FILES ${pnAsyncCore_PRIVATE})
source_group("Private" FILES ${pnAsyncCore_PRIVATE})

Loading…
Cancel
Save