mirror of https://github.com/PCSX2/pcsx2.git
debian: minor change, nothing to see
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@3576 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
8984e80c24
commit
5e3f568849
|
@ -27,3 +27,14 @@ ia32-libs: add .so symlink for compilation
|
||||||
ia32-libs-gtk: add libwxbase2.8 and libwxgtk2.8 (warning a architecture dependant include file (in -dev package) is also needed)
|
ia32-libs-gtk: add libwxbase2.8 and libwxgtk2.8 (warning a architecture dependant include file (in -dev package) is also needed)
|
||||||
ia32-libs-gtk: add .so symlink for compilation
|
ia32-libs-gtk: add .so symlink for compilation
|
||||||
|
|
||||||
|
|
||||||
|
== Multi-Arch support in APT ==
|
||||||
|
by David Kalnischkies, mentored by Michael Vogt
|
||||||
|
|
||||||
|
Hardware like 64bit processors are perfectly able to execute 32bit
|
||||||
|
opcode but until now this potentiality is disregard as the
|
||||||
|
infrastructure tools like dpkg and APT are not able to install and/or
|
||||||
|
solve dependencies across multiple architectures. The project
|
||||||
|
therefore focuses on enabling APT to work out good solutions in a
|
||||||
|
MultiArch aware environments without the need of hacky and partly
|
||||||
|
working biarch packages currently in use.
|
||||||
|
|
|
@ -1,24 +1,24 @@
|
||||||
Debian specific
|
Debian specific
|
||||||
Always uses the same executable name for the build. Easier for the install script
|
Always uses the same executable name for the build. Easier for the install script
|
||||||
Index: pcsx2.snapshot-3369/pcsx2/CMakeLists.txt
|
Index: pcsx2.snapshot-3567/pcsx2/CMakeLists.txt
|
||||||
===================================================================
|
===================================================================
|
||||||
--- pcsx2.snapshot-3369.orig/pcsx2/CMakeLists.txt
|
--- pcsx2.snapshot-3567.orig/pcsx2/CMakeLists.txt
|
||||||
+++ pcsx2.snapshot-3369/pcsx2/CMakeLists.txt
|
+++ pcsx2.snapshot-3567/pcsx2/CMakeLists.txt
|
||||||
@@ -83,7 +83,7 @@
|
@@ -72,7 +72,7 @@
|
||||||
if(CMAKE_BUILD_TYPE STREQUAL Debug)
|
if(CMAKE_BUILD_TYPE STREQUAL Debug)
|
||||||
|
|
||||||
# executable name
|
# executable name
|
||||||
- set(pcsx2Name pcsx2-dbg)
|
- set(Output pcsx2-dbg)
|
||||||
+ set(pcsx2Name pcsx2)
|
+ set(Output pcsx2)
|
||||||
|
|
||||||
# add defines
|
# add defines
|
||||||
add_definitions(${CommonFlags} ${DebugFlags} -DPCSX2_DEVBUILD -DPCSX2_DEBUG -DWX_PRECOMP)
|
add_definitions(${CommonFlags} ${DebugFlags} -DPCSX2_DEVBUILD -DPCSX2_DEBUG -DWX_PRECOMP)
|
||||||
@@ -93,7 +93,7 @@
|
@@ -82,7 +82,7 @@
|
||||||
if(CMAKE_BUILD_TYPE STREQUAL Devel)
|
if(CMAKE_BUILD_TYPE STREQUAL Devel)
|
||||||
|
|
||||||
# executable name
|
# executable name
|
||||||
- set(pcsx2Name pcsx2-dev)
|
- set(Output pcsx2-dev)
|
||||||
+ set(pcsx2Name pcsx2)
|
+ set(Output pcsx2)
|
||||||
|
|
||||||
# add defines
|
# add defines
|
||||||
add_definitions(${CommonFlags} ${OptimizationFlags} -DPCSX2_DEVBUILD -DWX_PRECOMP -DNDEBUG)
|
add_definitions(${CommonFlags} ${OptimizationFlags} -DPCSX2_DEVBUILD -DWX_PRECOMP -DNDEBUG)
|
||||||
|
|
|
@ -30,8 +30,8 @@ build-stamp:
|
||||||
-DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \
|
-DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \
|
||||||
-DCMAKE_BUILD_STRIP=FALSE \
|
-DCMAKE_BUILD_STRIP=FALSE \
|
||||||
-DFORCE_INTERNAL_SOUNDTOUCH=FALSE \
|
-DFORCE_INTERNAL_SOUNDTOUCH=FALSE \
|
||||||
-DUSER_CMAKE_C_FLAGS="$(USER_CFLAGS)" \
|
-DUSER_CMAKE_C_FLAGS:STRING="$(USER_CFLAGS)" \
|
||||||
-DUSER_CMAKE_CXX_FLAGS="$(USER_CXXFLAGS)"
|
-DUSER_CMAKE_CXX_FLAGS:STRING="$(USER_CXXFLAGS)"
|
||||||
$(MAKE) $(MAKEFLAGS)
|
$(MAKE) $(MAKEFLAGS)
|
||||||
|
|
||||||
touch build-stamp
|
touch build-stamp
|
||||||
|
|
|
@ -30,8 +30,8 @@ build-stamp:
|
||||||
-DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \
|
-DCMAKE_BUILD_TYPE=$(CMAKE_BUILD_TYPE) \
|
||||||
-DCMAKE_BUILD_STRIP=FALSE \
|
-DCMAKE_BUILD_STRIP=FALSE \
|
||||||
-DFORCE_INTERNAL_SOUNDTOUCH=FALSE \
|
-DFORCE_INTERNAL_SOUNDTOUCH=FALSE \
|
||||||
-DUSER_CMAKE_C_FLAGS="$(USER_CFLAGS)" \
|
-DUSER_CMAKE_C_FLAGS:STRING="$(USER_CFLAGS)" \
|
||||||
-DUSER_CMAKE_CXX_FLAGS="$(USER_CXXFLAGS)"
|
-DUSER_CMAKE_CXX_FLAGS:STRING="$(USER_CXXFLAGS)"
|
||||||
$(MAKE) $(MAKEFLAGS)
|
$(MAKE) $(MAKEFLAGS)
|
||||||
|
|
||||||
touch build-stamp
|
touch build-stamp
|
||||||
|
|
Loading…
Reference in New Issue