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

Replaced some defines that were accidentally removed at some point. Did some cmake work. Removed a forceinline that was giving gcc issues. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2951 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-05-05 20:06:05 +00:00
parent e0e6060414
commit 152a36fa98
5 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -9,6 +9,8 @@ cmake_minimum_required(VERSION 2.6)
include(${PROJECT_SOURCE_DIR}/cmake/Pcsx2Utils.cmake)
include(${PROJECT_SOURCE_DIR}/cmake/SearchForStuff.cmake)
#set(CMAKE_BUILD_TYPE Devel)
#-------------------------------------------------------------------------------
# if no build type is set, use Debug as default
#-------------------------------------------------------------------------------

22
cmake/SearchForStuff.cmake
View File

@ -212,6 +212,12 @@ endif(Subversion_FOUND)
set(CDVDnull TRUE)
#---------------------------------------
#---------------------------------------
# CDVDiso
#---------------------------------------
set(CDVDiso TRUE)
#---------------------------------------
#---------------------------------------
# dev9null
#---------------------------------------
@ -260,6 +266,18 @@ else(SDL_FOUND)
endif(SDL_FOUND)
#---------------------------------------
#---------------------------------------
# zeropad
#---------------------------------------
# requires: -SDL
#---------------------------------------
if(SDL_FOUND)
set(zeropad TRUE)
else(SDL_FOUND)
set(zeropad FALSE)
endif(SDL_FOUND)
#---------------------------------------
#---------------------------------------
# spu2-x
#---------------------------------------
@ -303,7 +321,7 @@ endif(SOUNDTOUCH_FOUND AND ALSA_FOUND)
#-------------------------------------------------------------------------------
# [TODO] Write CMakeLists.txt for these plugins.
set(cdvdGigaherz FALSE)
set(CDVDiso FALSE)
#set(CDVDiso FALSE)
set(CDVDisoEFP FALSE)
set(CDVDlinuz FALSE)
set(CDVDolio FALSE)
@ -313,6 +331,6 @@ set(LilyPad FALSE)
set(PeopsSPU2 FALSE)
set(SSSPSXPAD FALSE)
set(xpad FALSE)
set(zeropad FALSE)
#set(zeropad FALSE)
#-------------------------------------------------------------------------------

16
pcsx2/CMakeLists.txt
View File

@ -69,8 +69,8 @@ set(OptimizationFlags
# Debug - Build
if(CMAKE_BUILD_TYPE STREQUAL Debug)
# clear flags
set(CMAKE_C_FLAGS_DEBUG)
set(CMAKE_CXX_FLAGS_DEBUG)
set(CMAKE_C_FLAGS_DEBUG " ")
set(CMAKE_CXX_FLAGS_DEBUG " ")
# executable name
set(pcsx2Name pcsx2-dbg)
@ -82,27 +82,27 @@ endif(CMAKE_BUILD_TYPE STREQUAL Debug)
# Devel - Build
if(CMAKE_BUILD_TYPE STREQUAL Devel)
# clear flags
set(CMAKE_C_FLAGS_DEVEL)
set(CMAKE_CXX_FLAGS_DEVEL)
set(CMAKE_C_FLAGS_DEVEL " ")
set(CMAKE_CXX_FLAGS_DEVEL " ")
# executable name
set(pcsx2Name pcsx2-dev)
# add defines
add_definitions(${CommonFlags} ${OptimizationFlags} -DPCSX2_DEVBUILD -DPCSX2_DEVEL -DWX_PRECOMP)
add_definitions(${CommonFlags} ${OptimizationFlags} -DPCSX2_DEVBUILD -DPCSX2_DEVEL -DWX_PRECOMP -DNDEBUG)
endif(CMAKE_BUILD_TYPE STREQUAL Devel)
# Release - Build
if(CMAKE_BUILD_TYPE STREQUAL Release)
# clear flags
set(CMAKE_C_FLAGS_RELEASE)
set(CMAKE_CXX_FLAGS_RELEASE)
set(CMAKE_C_FLAGS_RELEASE " ")
set(CMAKE_CXX_FLAGS_RELEASE " ")
# executable name
set(pcsx2Name pcsx2)
# add defines
add_definitions(${CommonFlags} ${OptimizationFlags} ${LinkerFlags} -DWX_PRECOMP)
add_definitions(${CommonFlags} ${OptimizationFlags} ${LinkerFlags} -DWX_PRECOMP -DNDEBUG)
endif(CMAKE_BUILD_TYPE STREQUAL Release)
# get svn revision and generate svnrev.h

2
pcsx2/Linux/pcsx2.cbp
View File

@ -74,6 +74,7 @@
<Add option="-ftree-pre" />
<Add option="-DPCSX2_DEVBUILD" />
<Add option="-DPCSX2_DEVEL" />
<Add option="-DNDEBUG" />
</Compiler>
<ResourceCompiler>
<Add directory="$(ProjectRootDir)/gui" />
@ -126,6 +127,7 @@
<Add option="-falign-loops -falign-labels" />
<Add option="-ftree-vrp" />
<Add option="-ftree-pre" />
<Add option="-DNDEBUG" />
</Compiler>
<ResourceCompiler>
<Add directory="$(ProjectRootDir)/gui" />

3
pcsx2/x86/newVif_Dynarec.cpp
View File

@ -209,7 +209,8 @@ static _f void dVifRecLimit(int idx) {
}
}
_f void dVifUnpack(int idx, u8 *data, u32 size, bool isFill) {
// Gcc complains about recursive functions being inlined.
void dVifUnpack(int idx, u8 *data, u32 size, bool isFill) {
const nVifStruct& v = nVif[idx];
const u8 upkType = v.vif->cmd & 0x1f | ((!!v.vif->usn) << 5);