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

[cmake] Update include dir path. 

[debian] Update dependency
* only wxWidget 2.8.10 is supported
* Add the missing nvidia-cg-toolkit manually.


git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3471 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gregory.hainaut 2010-07-12 18:31:53 +00:00
parent 694f7cbddb
commit 8c6a66d955
3 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,6 +124,7 @@ set(UtilitiesSources
wxAppWithHelpers.cpp
wxGuiTools.cpp
wxHelpers.cpp
x86/MemcpyVibes.cpp
# x86/MemcpyFast.cpp
)
@ -160,6 +161,8 @@ set(UtilitiesHeaders
../../include/Utilities/wxGuiTools.h
PrecompiledHeader.h)
include_directories(.)
# change language of .S-files to c++
set_source_files_properties(${UtilitiesSSources} PROPERTIES LANGUAGE CXX)

16
debian-unstable-upstream/control
View File

@ -4,13 +4,13 @@ Priority: optional
Maintainer: Gregory Hainaut <gregory.hainaut@gmail.com>
Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8),
gcc-multilib [amd64], g++-multilib [amd64],
zlib1g-dev (>=1:1.2.3.3) | lib32z1-dev (>=1.2.3.3) [amd64],
zlib1g-dev (>= 1:1.2.3.3) | lib32z1-dev (>= 1.2.3.3) [amd64],
libbz2-dev (>= 1.0.4),
libsdl1.2-dev,
libjpeg-dev,
libwxbase2.8-dev (>=2.8.0),
libwxgtk2.8-dev (>=2.8.0),
libgtk2.0-dev (>=2.10),
libwxbase2.8-dev (>= 2.8.10), libwxbase2.8-dev (<< 2.8.11),
libwxgtk2.8-dev (>= 2.8.10), libwxgtk2.8-dev (<< 2.8.11),
libgtk2.0-dev (>= 2.16),
liba52-0.7.4-dev,
libasound2-dev | lib32asound2 [amd64],
portaudio19-dev,
@ -18,10 +18,10 @@ Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8),
# libsoundtouch1-dev (>= 1.5),
# I patch the source (remove feature) to compile with version 1.3
libsoundtouch1-dev (>= 1.3),
libsparsehash-dev (>=1.6),
libsparsehash-dev (>= 1.6),
libx11-dev,
libxxf86vm-dev,
libglew1.5-dev (>=1.5.1),
libglew1.5-dev (>= 1.5.1),
libgl1-mesa-dev,
libglu1-mesa-dev,
# my nmu: add 32bits packages
@ -68,7 +68,9 @@ Package: pcsx2-plugins-unstable
# Warning amd64 need additional ia32libs
Architecture: i386 amd64
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: pcsx2-unstable (>= ${binary:Version}), pcsx2-data-unstable (>= ${binary:Version})
Recommends: pcsx2-unstable (>= ${binary:Version}), pcsx2-data-unstable (>= ${binary:Version}),
# manually add nvidia-cg-toolkit for zzogl. Do not why is not found by shlibs !!!
nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 2.1), ia32-nvidia-cg-toolkit-pcsx2 [amd64]
Conflicts: pcsx2-plugins
Description: Various plugins for pcsx2
PCSX2 is a PlayStation 2 emulator for Windows and

16
debian-unstable-upstream/control_ppa
View File

@ -3,13 +3,13 @@ Section: games
Priority: optional
Maintainer: Gregory Hainaut <gregory.hainaut@gmail.com>
Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8),
zlib1g-dev (>=1:1.2.3.3),
zlib1g-dev (>= 1:1.2.3.3),
libbz2-dev (>= 1.0.4),
libsdl1.2-dev,
libjpeg-dev,
libwxbase2.8-dev (>=2.8.0),
libwxgtk2.8-dev (>=2.8.0),
libgtk2.0-dev (>=2.10),
libwxbase2.8-dev (>= 2.8.10), libwxbase2.8-dev (<< 2.8.11),
libwxgtk2.8-dev (>= 2.8.10), libwxgtk2.8-dev (<< 2.8.11),
libgtk2.0-dev (>= 2.16),
liba52-0.7.4-dev,
libasound2-dev,
portaudio19-dev,
@ -17,10 +17,10 @@ Build-Depends: debhelper (>= 7.0.50), dpkg-dev (>= 1.15.5.6), cmake (>=2.8),
# libsoundtouch1-dev (>= 1.5),
# I patch the source (remove feature) to compile with version 1.3
libsoundtouch1-dev (>= 1.3),
libsparsehash-dev (>=1.6),
libsparsehash-dev (>= 1.6),
libx11-dev,
libxxf86vm-dev,
libglew1.5-dev (>=1.5.1),
libglew1.5-dev (>= 1.5.1),
libgl1-mesa-dev,
libglu1-mesa-dev,
nvidia-cg-toolkit-pcsx2
@ -62,7 +62,9 @@ Description: data for pcsx2
Package: pcsx2-plugins-unstable
Architecture: i386
Depends: ${shlibs:Depends}, ${misc:Depends}
Recommends: pcsx2-unstable (>= ${binary:Version}), pcsx2-data-unstable (>= ${binary:Version})
Recommends: pcsx2-unstable (>= ${binary:Version}), pcsx2-data-unstable (>= ${binary:Version}),
# manually add nvidia-cg-toolkit for zzogl. Do not why is not found by shlibs !!!
nvidia-cg-toolkit-pcsx2 | nvidia-cg-toolkit (>= 2.1)
Conflicts: pcsx2-plugins
Description: Various plugins for pcsx2
PCSX2 is a PlayStation 2 emulator for Windows and