ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix back up CMake. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2599 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-02-17 13:40:45 +00:00
parent 2edc495520
commit 839d5b37f4
4 changed files with 216 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/FindCg.cmake
View File

@ -36,6 +36,7 @@ else(WIN32) # Unix based OS
find_program(CG_COMPILER cgc PATHS
/usr/bin
/usr/local/bin
/opt/nvidia-cg-toolkit/bin
DOC "Path to the Cg compiler.")
# find Cg include
@ -49,15 +50,15 @@ else(WIN32) # Unix based OS
# Cg library
find_library(CG_LIBRARY NAMES Cg PATHS
/usr/include
/usr/local/include
/opt/nvidia-cg-toolkit/include
/usr/local/lib
/opt/nvidia-cg-toolkit/lib
DOC "Path to the Cg library.")
# Cg GL library
find_library(CG_GL_LIBRARY NAMES CgGL PATHS
/usr/include
/usr/local/include
/opt/nvidia-cg-toolkit/include
/usr/local/lib
/opt/nvidia-cg-toolkit/lib
DOC "Path to the CgGL library.")
set(CG_LIBRARIES ${CG_LIBRARY} ${CG_GL_LIBRARY})

4
common/build/Utilities/Utilities.cbp
View File

@ -162,16 +162,14 @@
<Unit filename="../../include/Utilities/ScopedPtr.h" />
<Unit filename="../../include/Utilities/StringHelpers.h" />
<Unit filename="../../include/Utilities/Threading.h" />
<Unit filename="../../include/Utilities/TlsVariable.h" />
<Unit filename="../../include/Utilities/lnx_memzero.h" />
<Unit filename="../../include/Utilities/pxCheckBox.h" />
<Unit filename="../../include/Utilities/pxRadioPanel.h" />
<Unit filename="../../include/Utilities/pxStaticText.h" />
<Unit filename="../../include/Utilities/win_memzero.h" />
<Unit filename="../../include/Utilities/wxBaseTools.h" />
<Unit filename="../../include/Utilities/wxAppWithHelpers.h" />
<Unit filename="../../include/Utilities/wxBaseTools.h" />
<Unit filename="../../include/Utilities/wxGuiTools.h" />
<Unit filename="../../include/Utilities/wxHelpers.h" />
<Unit filename="../../include/intrin_x86.h" />
<Unit filename="../../src/Utilities/AlignedMalloc.cpp" />
<Unit filename="../../src/Utilities/CheckedStaticBox.cpp" />

3
common/src/Utilities/CMakeLists.txt
View File

@ -102,7 +102,6 @@ endif(CMAKE_BUILD_TYPE STREQUAL Release)
# variable with all sources of this library
set(UtilitiesSources
../../include/Utilities/EventSource.inl
../../include/Utilities/TlsVariable.inl
AlignedMalloc.cpp
CheckedStaticBox.cpp
Console.cpp
@ -122,6 +121,7 @@ set(UtilitiesSources
StringHelpers.cpp
ThreadTools.cpp
vssprintf.cpp
wxAppWithHelpers.cpp
wxGuiTools.cpp
wxHelpers.cpp
# x86/MemcpyFast.cpp
@ -153,6 +153,7 @@ set(UtilitiesHeaders
../../include/Utilities/ScopedPtr.h
../../include/Utilities/StringHelpers.h
../../include/Utilities/Threading.h
../../include/Utilities/wxAppWithHelpers.h
../../include/Utilities/wxBaseTools.h
../../include/Utilities/wxGuiTools.h
PrecompiledHeader.h)

5
pcsx2/CMakeLists.txt
View File

@ -167,9 +167,8 @@ set(pcsx2Sources
SPR.cpp
Stats.cpp
System.cpp
Vif0_Commands.cpp
Vif_Commands.cpp
Vif0_Dma.cpp
Vif1_Commands.cpp
Vif1_Dma.cpp
Vif1_MFIFO.cpp
Vif.cpp
@ -288,7 +287,6 @@ set(pcsx2GuiSources
gui/AppAssert.cpp
gui/AppConfig.cpp
gui/AppCoreThread.cpp
gui/AppEventListeners.cpp
gui/AppEventSources.cpp
gui/AppInit.cpp
gui/AppMain.cpp
@ -346,6 +344,7 @@ set(pcsx2GuiHeaders
gui/ApplyState.h
gui/AppCommon.h
gui/AppConfig.h
gui/AppEventListeners.h
gui/AppForwardDefs.h
gui/ConsoleLogger.h
gui/CpuUsageProvider.h