From 2e25acec31797bb12dc956211da94831608966ee Mon Sep 17 00:00:00 2001 From: bgk Date: Wed, 14 Dec 2011 14:30:28 +0000 Subject: [PATCH] DEBIAN: GTK and WX can now build together properly. No need to build twice anymore. --- debian/control | 2 +- debian/rules | 14 +++----------- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/debian/control b/debian/control index d87a7900..cd68c926 100644 --- a/debian/control +++ b/debian/control @@ -33,7 +33,7 @@ Description: Nintendo Game Boy Advance emulator (GTK+ frontend) Package: vbam-wx Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} -Description: Nintendo Game Boy Advance emulator (GTK+ frontend) +Description: Nintendo Game Boy Advance emulator (wxWidgets frontend) VisualBoyAdvance-M is a Nintendo Game Boy Emulator with high compatibility with commercial games. It emulates the Nintendo Game Boy Advance handheld console, in addition to the original Game Boy diff --git a/debian/rules b/debian/rules index 9db603b2..ddc0f41f 100755 --- a/debian/rules +++ b/debian/rules @@ -23,23 +23,16 @@ endif builddir/Makefile: dh_testdir - mkdir -p builddir builddir-wx + mkdir -p builddir cd builddir && \ cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_FLAGS="$(CFLAGS)" \ -DCMAKE_LD_FLAGS="-Wl,-z,defs" -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \ - -DENABLE_LIRC=ON -DENABLE_WX=OFF \ - -DCMAKE_SKIP_RPATH=ON $(EXTRA_CMAKE_FLAGS) - cd builddir-wx && \ - cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_C_FLAGS="$(CFLAGS)" \ - -DCMAKE_LD_FLAGS="-Wl,-z,defs" -DCMAKE_CXX_FLAGS="$(CXXFLAGS)" \ - -DENABLE_LINK=ON -DENABLE_WX=ON -DENABLE_SDL=OFF -DENABLE_GTK=OFF\ - -DCMAKE_SKIP_RPATH=ON $(EXTRA_CMAKE_FLAGS) + -DENABLE_LIRC=ON -DCMAKE_SKIP_RPATH=ON $(EXTRA_CMAKE_FLAGS) build: build-stamp build-stamp: builddir/Makefile dh_testdir - $(MAKE) -C builddir-wx $(MAKE) -C builddir touch $@ @@ -47,7 +40,7 @@ clean: dh_testdir dh_testroot rm -f build-stamp - rm -rf builddir builddir-wx + rm -rf builddir dh_clean install: build @@ -56,7 +49,6 @@ install: build dh_prep dh_installdirs $(MAKE) -C builddir DESTDIR=$(CURDIR)/debian/tmp install - $(MAKE) -C builddir-wx DESTDIR=$(CURDIR)/debian/tmp install binary-indep: install