ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

wineandroid.drv: Pass the source directory on the gradle command line. 

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2020-09-11 12:40:43 +02:00
parent 4935576d4a
commit 22628bcc17
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.in
View File

@ -75,7 +75,7 @@ RUNTESTFLAGS = -q -P wine
MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT) MAKEDEP = $(TOOLSDIR)/tools/makedep$(TOOLSEXT)
DELAYLOADFLAG = @DELAYLOADFLAG@ DELAYLOADFLAG = @DELAYLOADFLAG@
PACKAGE_VERSION = @PACKAGE_VERSION@ PACKAGE_VERSION = @PACKAGE_VERSION@
SED_CMD = LC_ALL=C sed -e 's,@bindir\@,${bindir},g' -e 's,@dlldir\@,${dlldir},g' -e 's,@srcdir\@,${srcdir},g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g' SED_CMD = LC_ALL=C sed -e 's,@bindir\@,${bindir},g' -e 's,@dlldir\@,${dlldir},g' -e 's,@PACKAGE_STRING\@,@PACKAGE_STRING@,g' -e 's,@PACKAGE_VERSION\@,@PACKAGE_VERSION@,g'
api_manext = 3w api_manext = 3w
WINELOADER_PROGRAMS = @WINELOADER_PROGRAMS@ WINELOADER_PROGRAMS = @WINELOADER_PROGRAMS@
WINELOADER_DEPENDS = @WINELOADER_DEPENDS@ WINELOADER_DEPENDS = @WINELOADER_DEPENDS@

2
dlls/wineandroid.drv/Makefile.in
View File

@ -18,5 +18,5 @@ SVG_SRCS = \
EXTRA_TARGETS = wine-debug.apk EXTRA_TARGETS = wine-debug.apk
wine-debug.apk: build.gradle $(srcdir)/AndroidManifest.xml $(srcdir)/WineActivity.java $(srcdir)/wine.svg wine-debug.apk: build.gradle $(srcdir)/AndroidManifest.xml $(srcdir)/WineActivity.java $(srcdir)/wine.svg
gradle -q assembleDebug gradle -q -Psrcdir=$(srcdir) assembleDebug
mv build/outputs/apk/wine-debug.apk $@ mv build/outputs/apk/wine-debug.apk $@

6
dlls/wineandroid.drv/build.gradle.in
View File

@ -39,7 +39,7 @@ def add_icon_task( dir, scale )
outputs.dir( outdir ) outputs.dir( outdir )
doFirst { outdir.mkdirs() } doFirst { outdir.mkdirs() }
def png = new File( outdir, "wine.png" ) def png = new File( outdir, "wine.png" )
def svg = new File( "@srcdir@", "wine.svg" ) def svg = new File( srcdir, "wine.svg" )
inputs.file( svg ) inputs.file( svg )
outputs.file( png ) outputs.file( png )
commandLine "rsvg-convert", "-z", scale, "-o", png, svg commandLine "rsvg-convert", "-z", scale, "-o", png, svg
@ -97,10 +97,10 @@ android
sourceSets sourceSets
{ {
main.assets.srcDirs = [ "assets" ] main.assets.srcDirs = [ "assets" ]
main.java.srcDirs = [ "@srcdir@" ] main.java.srcDirs = [ srcdir ]
main.jniLibs.srcDirs = [ "lib" ] main.jniLibs.srcDirs = [ "lib" ]
main.java.excludes = [ "build" ] main.java.excludes = [ "build" ]
main.res.srcDirs = [ "res" ] main.res.srcDirs = [ "res" ]
main.manifest.srcFile "@srcdir@/AndroidManifest.xml" main.manifest.srcFile srcdir + "/AndroidManifest.xml"
} }
} }