summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Theodore <tonyt@logyst.com>2015-11-15 16:25:49 (GMT)
committerTony Theodore <tonyt@logyst.com>2015-11-15 16:25:49 (GMT)
commite8111c548c5b652aaad6a665a1e8501bb88eb56f (patch)
treedf0d2c8219047432aa652879d5a42006484a878c
parentde35582bc463a8bbf96e7f1d61b5be493cffe30f (diff)
parentf49967131808d2066b162c5033271e79d06e0bdc (diff)
downloadmxe-e8111c548c5b652aaad6a665a1e8501bb88eb56f.zip
mxe-e8111c548c5b652aaad6a665a1e8501bb88eb56f.tar.gz
mxe-e8111c548c5b652aaad6a665a1e8501bb88eb56f.tar.bz2
Merge pull request #999 from LuaAndC/wine-in-path
disable wine
-rw-r--r--src/mxe-conf.mk15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/mxe-conf.mk b/src/mxe-conf.mk
index 558d307..9adc685 100644
--- a/src/mxe-conf.mk
+++ b/src/mxe-conf.mk
@@ -62,9 +62,6 @@ define $(PKG)_BUILD
> '$(PREFIX)/bin/$(TARGET)-cmake'
chmod 0755 '$(PREFIX)/bin/$(TARGET)-cmake'
- #create readonly directory to force wine to fail
- $(INSTALL) -m444 -d "$$WINEPREFIX"
-
# create pkg-config files for OpenGL/GLU
$(INSTALL) -d '$(PREFIX)/$(TARGET)/lib/pkgconfig'
(echo 'Name: gl'; \
@@ -72,7 +69,6 @@ define $(PKG)_BUILD
echo 'Description: OpenGL'; \
echo 'Libs: -lopengl32';) \
> '$(PREFIX)/$(TARGET)/lib/pkgconfig/gl.pc'
-
(echo 'Name: glu'; \
echo 'Version: 0'; \
echo 'Description: OpenGL'; \
@@ -101,4 +97,15 @@ define $(PKG)_BUILD_$(BUILD)
> '$(1)/configure.ac'
cd '$(1)' && autoreconf -fiv
cd '$(1)' && ./configure
+
+ #create readonly directory to force wine to fail
+ $(INSTALL) -m444 -d "$$WINEPREFIX"
+
+ #create script "wine" in a directory which is in PATH
+ mkdir -p '$(PREFIX)/$(BUILD)/bin/'
+ (echo '#!/usr/bin/env bash'; \
+ echo 'exit 1'; \
+ ) \
+ > '$(PREFIX)/$(BUILD)/bin/wine'
+ chmod 0755 '$(PREFIX)/$(BUILD)/bin/wine'
endef