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

Applied patch 2868577 by fernandotcl. 

The changes are :
- debian/control: Build-Depends now include nasm for i386 and amd64
- debian/control: Architecture is now "any"
- debian/rules: Less verbosity when DH_VERBOSE is not set
- debian/rules: -DUSE_ARM_SCALERS=ON -DUSE_ARM_CORE=ON on i386 and amd64
architectures
- CMakeLists.txt: Out-of-source builds using USE_ARM_SCALERS is now
working


git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@914 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
bgk 2009-10-04 06:43:20 +00:00
parent c4f19280b6
commit 7a90c6c204
4 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -108,9 +108,9 @@ ENDIF( NOT USE_ASM_CORE )
# Compiler flags # Compiler flags
IF ( WIN32 ) IF ( WIN32 )
SET( CMAKE_ASM_FLAGS "-Isrc/filters/hq/asm/ -O1 -w-orphan-labels") SET( CMAKE_ASM_FLAGS "-I$(CMAKE_SOURCE_DIR)/src/filters/hq/asm/ -O1 -w-orphan-labels")
ELSE ( WIN32 ) ELSE ( WIN32 )
SET( CMAKE_ASM_FLAGS "-Isrc/filters/hq/asm/ -O1 -DELF -w-orphan-labels") SET( CMAKE_ASM_FLAGS "-I$(CMAKE_SOURCE_DIR)/src/filters/hq/asm/ -O1 -DELF -w-orphan-labels")
ENDIF ( WIN32 ) ENDIF ( WIN32 )
SET( CMAKE_C_FLAGS "-O3 -Wall") SET( CMAKE_C_FLAGS "-O3 -Wall")
SET( CMAKE_CXX_FLAGS "-O3 -Wall") SET( CMAKE_CXX_FLAGS "-O3 -Wall")

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
vbam (1.8.0.913-1) unstable; urgency=low
* Using assembly optmizations for i386 and amd64 platforms
-- Fernando Tarlá Cardoso Lemos <fernandotcl@gmail.com> Sat, 03 Oct 2009 22:41:55 -0300
vbam (1.8.0.912-1) unstable; urgency=low vbam (1.8.0.912-1) unstable; urgency=low
* Added libglademm-2.4-dev as a build-time dependency * Added libglademm-2.4-dev as a build-time dependency

4
debian/control vendored
View File

@ -2,12 +2,12 @@ Source: vbam
Section: otherosfs Section: otherosfs
Priority: optional Priority: optional
Maintainer: Fernando Tarlá Cardoso Lemos <fernandotcl@gmail.com> Maintainer: Fernando Tarlá Cardoso Lemos <fernandotcl@gmail.com>
Build-Depends: debhelper (>= 7), cmake, libsdl1.2-dev, libgl-dev, libgtkmm-2.4-dev, libgtkglextmm-x11-1.2-dev, libglademm-2.4-dev Build-Depends: debhelper (>= 7), cmake, nasm [i386 amd64], libsdl1.2-dev, libgl-dev, libgtkmm-2.4-dev, libgtkglextmm-x11-1.2-dev, libglademm-2.4-dev
Standards-Version: 3.8.1 Standards-Version: 3.8.1
Homepage: http://www.vbam.com Homepage: http://www.vbam.com
Package: vbam Package: vbam
Architecture: i386 Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends} Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Nintendo Game Boy Advance emulator Description: Nintendo Game Boy Advance emulator
VisualBoyAdvance-M is a Nintendo Game Boy Emulator with high compatibility VisualBoyAdvance-M is a Nintendo Game Boy Emulator with high compatibility

20
debian/rules vendored
View File

@ -1,23 +1,31 @@
#!/usr/bin/make -f #!/usr/bin/make -f
# -*- makefile -*- # -*- makefile -*-
# Sample debian/rules that uses debhelper. # vi: ts=4 sw=4 noet
# This file was originally written by Joey Hess and Craig Small. #
# As a special exception, when this file is copied by dh-make into a # debian/rules file that uses debhelper
# dh-make output file, you may use that output file without restriction. # Based on an autogenerated debhelper sample
# This special exception was added by Craig Small in version 0.37 of dh-make. #
# Uncomment this to turn on verbose mode. # Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1 #export DH_VERBOSE=1
DEB_BUILD_ARCH_CPU ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU)
EXTRA_CMAKE_FLAGS =
ifeq ($(DH_VERBOSE),1)
EXTRA_CMAKE_FLAGS += -DCMAKE_VERBOSE_MAKEFILE=ON
endif
ifneq (,$(filter $(DEB_BUILD_ARCH_CPU),i386 amd64))
EXTRA_CMAKE_FLAGS += -DUSE_ASM_SCALERS=ON -DUSE_ASM_CORE=ON
endif
builddir/Makefile: builddir/Makefile:
dh_testdir dh_testdir
# Add here commands to configure the package. # Add here commands to configure the package.
mkdir -p builddir mkdir -p builddir
cd builddir && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_LD_FLAGS="-Wl,-z,defs" -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" -DCMAKE_SKIP_RPATH=ON -DCMAKE_VERBOSE_MAKEFILE=ON cd builddir && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_FLAGS="$(CFLAGS)" -DCMAKE_LD_FLAGS="-Wl,-z,defs" -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" -DCMAKE_SKIP_RPATH=ON $(EXTRA_CMAKE_FLAGS)
build: build-stamp build: build-stamp