diff options
| author | jstebbins <[email protected]> | 2010-05-25 21:02:47 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2010-05-25 21:02:47 +0000 |
| commit | ebb28e921481ce1642d5ed9f8ab0c45939b2df77 (patch) | |
| tree | 21371882f73cf6bc38d385aa0b2b5a5ba5282433 | |
| parent | 9114059136bdb05f0ed7a3458cf51bc485364107 (diff) | |
LinGui: fix module.defs code merge error
two incompatible changes merged without error and i missed it
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3327 b64f7644-9d1e-0410-96f1-a4d463321fa5
| -rw-r--r-- | gtk/module.defs | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/gtk/module.defs b/gtk/module.defs index 9881a9000..cd4992bd9 100644 --- a/gtk/module.defs +++ b/gtk/module.defs @@ -6,13 +6,6 @@ GTK.build/ = $(BUILD/)gtk/ GTK.CONFIGURE.stamp = $(GTK.build/).stamp.configure -ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) -GTK.CONFIGURE.extra += --host=$(BUILD.spec) -ifeq ($(HAS.dlfcn),1) - GTK.CONFIGURE.extra += --enable-dl -endif -endif - ############################################################################### GTK.out += $(GTK.CONFIGURE.stamp) @@ -22,8 +15,10 @@ BUILD.out += $(GTK.out) ############################################################################### ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) - GTK.GCC.D += PTW32_STATIC_LIB - GTK.CONFIGURE.extra = --host=$(BUILD.spec) +GTK.CONFIGURE.extra += --host=$(BUILD.spec) +ifeq ($(HAS.dlfcn),1) + GTK.CONFIGURE.extra += --enable-dl +endif endif ifeq (0,$(FEATURE.gtk.update.checks)) |