piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-31 01:59:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Reestablish *BSD build using CMake.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6516 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Soren Jorvang
2010-12-04 15:19:04 +00:00
parent e70e623624
commit 7901e74f00
8 changed files with 55 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Core/CMakeLists.txt
View File

@ -135,7 +135,7 @@ if(WIN32)
set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Win32.cpp Src/stdafx.cpp)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Apple.cpp)
elseif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
elseif(UNIX)
set(SRCS ${SRCS} Src/HW/BBA-TAP/TAP_Unix.cpp)
endif()

7
Source/Core/DSPCore/Src/Jit/DSPJitMisc.cpp
View File

@ -321,7 +321,7 @@ void DSPEmitter::mrr(const UDSPInstruction opc)
dsp_conditional_extend_accum(dreg);
}
/*
#if 0
// LRI $D, #I
// 0000 0000 100d dddd
// iiii iiii iiii iiii
@ -332,15 +332,14 @@ void DSPEmitter::mrr(const UDSPInstruction opc)
// register, has a different behaviour in S40 mode if loaded to AC0.M: The
// value gets sign extended to the whole accumulator! This does not happen in
// S16 mode.
/*void DSPEmitter::lri(const UDSPInstruction opc)
void DSPEmitter::lri(const UDSPInstruction opc)
{
u8 reg = opc & DSP_REG_MASK;
u16 imm = dsp_fetch_code();
dsp_op_write_reg(reg, imm);
dsp_conditional_extend_accum(reg);
}
*/
#endif
// LRIS $(0x18+D), #I
// 0000 1ddd iiii iiii

16
Source/Core/DolphinWX/CMakeLists.txt
View File

@ -16,10 +16,6 @@ set(LIBS core
${X11_LIBRARIES})
if(wxWidgets_FOUND)
set(MEMCARDSRCS Src/MemcardManager.cpp
Src/MemoryCards/GCMemcard.cpp
Src/WxUtils.cpp)
set(SRCS ${SRCS}
Src/AboutDolphin.cpp
Src/ARCodeAddEdit.cpp
@ -38,6 +34,8 @@ if(wxWidgets_FOUND)
Src/LogWindow.cpp
Src/LuaWindow.cpp
Src/Main.cpp
Src/MemcardManager.cpp
Src/MemoryCards/GCMemcard.cpp
Src/NetPlay.cpp
Src/NetPlayClient.cpp
Src/NetPlayServer.cpp
@ -45,12 +43,12 @@ if(wxWidgets_FOUND)
Src/PatchAddEdit.cpp
Src/UDPConfigDiag.cpp
Src/WiimoteConfigDiag.cpp
Src/MemoryCards/WiiSaveCrypted.cpp)
Src/MemoryCards/WiiSaveCrypted.cpp
Src/WxUtils.cpp)
set(WXLIBS debwx
debugger_ui_util
inputuicommon
memcard
${wxWidgets_LIBRARIES}
${GTK2_LIBRARIES})
@ -70,11 +68,15 @@ else()
set(SRCS ${SRCS} Src/X11Utils.cpp)
endif()
if(${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" OR
${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
set(LIBS ${LIBS} usbhid)
endif()
set(EXEGUI dolphin-emu)
set(EXENOGUI dolphin-emu-nogui)
if(wxWidgets_FOUND)
add_library(memcard STATIC ${MEMCARDSRCS})
add_executable(${EXEGUI} ${SRCS})
target_link_libraries(${EXEGUI} ${LIBS} ${WXLIBS})
install(TARGETS ${EXEGUI} RUNTIME DESTINATION ${bindir})