Skip to content
Permalink
Browse files

Common/CMakeLists: Specify headers alongside source files

Allows these files to show up as part of the project when generating IDE
builds from CMake.
  • Loading branch information...
lioncash committed May 29, 2019
1 parent 5ffbec6 commit 48b82e82dbdfd7d5a00c06c085a9ad062934ead7
Showing with 111 additions and 6 deletions.
  1. +111 −6 Source/Core/Common/CMakeLists.txt
@@ -1,52 +1,131 @@
add_library(common
Analytics.cpp
Analytics.h
Assert.h
Atomic.h
BitField.h
BitSet.h
BitUtils.h
BlockingLoop.h
CDUtils.cpp
CDUtils.h
ChunkFile.h
CodeBlock.h
ColorUtil.cpp
ColorUtil.h
Common.h
CommonFuncs.cpp
CommonFuncs.h
CommonPaths.h
CommonTypes.h
Compiler.h
Config/Config.cpp
Config/Config.h
Config/ConfigInfo.cpp
Config/ConfigInfo.h
Config/Enums.h
Config/Layer.cpp
Config/Layer.h
CPUDetect.h
Crypto/AES.cpp
Crypto/AES.h
Crypto/bn.cpp
Crypto/bn.h
Crypto/ec.cpp
Crypto/ec.h
Debug/MemoryPatches.cpp
Debug/MemoryPatches.h
Debug/Watches.cpp
Debug/Watches.h
DebugInterface.h
DynamicLibrary.cpp
DynamicLibrary.h
ENetUtil.cpp
ENetUtil.h
Event.h
File.cpp
File.h
FileSearch.cpp
FileSearch.h
FileUtil.cpp
FileUtil.h
FixedSizeQueue.h
Flag.h
FloatUtils.cpp
FloatUtils.h
FPURoundMode.h
GekkoDisassembler.cpp
GekkoDisassembler.h
Hash.cpp
Hash.h
HttpRequest.cpp
HttpRequest.h
Image.cpp
Image.h
IniFile.cpp
IniFile.h
JitRegister.cpp
JitRegister.h
Lazy.h
LinearDiskCache.h
Logging/ConsoleListener.h
Logging/Log.h
Logging/LogManager.cpp
Logging/LogManager.h
MathUtil.cpp
MathUtil.h
Matrix.cpp
Matrix.h
MD5.cpp
MD5.h
MemArena.cpp
MemArena.h
MemoryUtil.cpp
MemoryUtil.h
MsgHandler.cpp
MsgHandler.h
NandPaths.cpp
NandPaths.h
Network.cpp
Network.h
PcapFile.cpp
PcapFile.h
PerformanceCounter.cpp
PerformanceCounter.h
Profiler.cpp
Profiler.h
QoSSession.cpp
QoSSession.h
Random.cpp
Random.h
Result.h
ScopeGuard.h
SDCardUtil.cpp
SDCardUtil.h
Semaphore.h
SFMLHelper.cpp
SFMLHelper.h
SettingsHandler.cpp
SettingsHandler.h
SPSCQueue.h
StringUtil.cpp
StringUtil.h
SymbolDB.cpp
SymbolDB.h
Thread.cpp
Thread.h
Timer.cpp
Timer.h
TraversalClient.cpp
TraversalClient.h
TraversalProto.h
UPnP.cpp
UPnP.h
VariantUtil.h
Version.cpp
Version.h
WindowSystemInfo.h
WorkQueueThread.h
)

target_link_libraries(common
@@ -82,11 +161,13 @@ endif()
if(ANDROID)
target_sources(common PRIVATE
AndroidAnalytics.cpp
AndroidAnalytics.h
Logging/ConsoleListenerDroid.cpp
)
elseif(WIN32)
target_sources(common PRIVATE
LdrWatcher.cpp
LdrWatcher.h
Logging/ConsoleListenerWin.cpp
)
else()
@@ -98,16 +179,21 @@ endif()
if(_M_ARM_64)
target_sources(common PRIVATE
Arm64Emitter.cpp
Arm64Emitter.h
ArmCommon.h
ArmCPUDetect.cpp
GenericFPURoundMode.cpp
)
else()
if(_M_X86) #X86
target_sources(common PRIVATE
x64ABI.cpp
x64ABI.h
x64Emitter.cpp
x64Emitter.h
x64FPURoundMode.cpp
x64CPUDetect.cpp
x64Reg.h
)
else() # Generic
target_sources(common PRIVATE
@@ -119,17 +205,29 @@ endif()

# OpenGL Interface
target_sources(common PRIVATE
GL/GLContext.cpp
GL/GLContext.h
GL/GLUtil.cpp
GL/GLUtil.h
GL/GLExtensions/GLExtensions.cpp
GL/GLContext.cpp
GL/GLExtensions/GLExtensions.h
)

if(ENABLE_EGL AND EGL_FOUND)
target_sources(common PRIVATE GL/GLInterface/EGL.cpp)
target_sources(common PRIVATE
GL/GLInterface/EGL.cpp
GL/GLInterface/EGL.h
)
if(ANDROID)
target_sources(common PRIVATE GL/GLInterface/EGLAndroid.cpp)
target_sources(common PRIVATE
GL/GLInterface/EGLAndroid.cpp
GL/GLInterface/EGLAndroid.h
)
elseif(ENABLE_X11 AND X11_FOUND)
target_sources(common PRIVATE GL/GLInterface/EGLX11.cpp)
target_sources(common PRIVATE
GL/GLInterface/EGLX11.cpp
GL/GLInterface/EGLX11.h
)
endif()
target_include_directories(common PRIVATE ${EGL_INCLUDE_DIRS})
target_link_libraries(common PUBLIC ${EGL_LIBRARIES})
@@ -139,13 +237,20 @@ if(WIN32)
target_sources(common PRIVATE
CompatPatches.cpp
GL/GLInterface/WGL.cpp
GL/GLInterface/WGL.h
)
elseif(APPLE)
target_sources(common PRIVATE GL/GLInterface/AGL.mm)
target_sources(common PRIVATE
GL/GLInterface/AGL.h
GL/GLInterface/AGL.mm
)
elseif(ENABLE_X11 AND X11_FOUND)
target_sources(common PRIVATE
GL/GLX11Window.cpp
GL/GLInterface/GLX.cpp)
GL/GLX11Window.h
GL/GLInterface/GLX.cpp
GL/GLInterface/GLX.h
)

# GLX has a hard dependency on libGL.
# Make sure to link to it if using GLX.

0 comments on commit 48b82e8

Please sign in to comment.
You can’t perform that action at this time.