---

yaml --- r: 304822 b: refs/heads/master c: e7b3ba6 h: refs/heads/master v: v3
git-mirror · Apr 11, 2012 · e15cad1 · e15cad1
1 parent 4a35526
commit e15cad1
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aca7a94d6a59d6bf2600768e752f971c6cc0ab57
+refs/heads/master: e7b3ba6d8b29904c336e3e6a018bb80d1f63b1f4
diff --git a/trunk/tools/perf/Makefile b/trunk/tools/perf/Makefile
@@ -493,7 +493,7 @@ else
 endif
 
 ifdef NO_GTK2
-	BASIC_CFLAGS += -DNO_GTK2
+	BASIC_CFLAGS += -DNO_GTK2_SUPPORT
 else
 	FLAGS_GTK2=$(ALL_CFLAGS) $(ALL_LDFLAGS) $(EXTLIBS) $(shell pkg-config --libs --cflags gtk+-2.0)
 	ifneq ($(call try-cc,$(SOURCE_GTK2),$(FLAGS_GTK2)),y)
@@ -502,7 +502,7 @@ else
 	else
 		BASIC_CFLAGS += $(shell pkg-config --cflags gtk+-2.0)
 		EXTLIBS += $(shell pkg-config --libs gtk+-2.0)
-		LIB_OBJS += $(OUTPUT)util/gtk/browser.o
+		LIB_OBJS += $(OUTPUT)ui/gtk/browser.o
 	endif
 endif
 

diff --git a/trunk/tools/perf/util/gtk/browser.c → trunk/tools/perf/ui/gtk/browser.c b/trunk/tools/perf/util/gtk/browser.c → trunk/tools/perf/ui/gtk/browser.c
diff --git a/trunk/tools/perf/util/gtk/gtk.h → trunk/tools/perf/ui/gtk/gtk.h b/trunk/tools/perf/util/gtk/gtk.h → trunk/tools/perf/ui/gtk/gtk.h