Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
22628bcc
Commit
22628bcc
authored
Sep 11, 2020
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wineandroid.drv: Pass the source directory on the gradle command line.
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
4935576d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
5 deletions
+5
-5
Makefile.in
Makefile.in
+1
-1
Makefile.in
dlls/wineandroid.drv/Makefile.in
+1
-1
build.gradle.in
dlls/wineandroid.drv/build.gradle.in
+3
-3
No files found.
Makefile.in
View file @
22628bcc
...
...
@@ -75,7 +75,7 @@ RUNTESTFLAGS = -q -P wine
MAKEDEP
=
$(TOOLSDIR)
/tools/makedep
$(TOOLSEXT)
DELAYLOADFLAG
=
@DELAYLOADFLAG@
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
WINELOADER_PROGRAMS
=
@WINELOADER_PROGRAMS@
WINELOADER_DEPENDS
=
@WINELOADER_DEPENDS@
...
...
dlls/wineandroid.drv/Makefile.in
View file @
22628bcc
...
...
@@ -18,5 +18,5 @@ SVG_SRCS = \
EXTRA_TARGETS
=
wine-debug.apk
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
$@
dlls/wineandroid.drv/build.gradle.in
View file @
22628bcc
...
...
@@ -39,7 +39,7 @@ def add_icon_task( dir, scale )
outputs.dir( outdir )
doFirst { outdir.mkdirs() }
def png = new File( outdir, "wine.png" )
def svg = new File(
"@srcdir@"
, "wine.svg" )
def svg = new File(
srcdir
, "wine.svg" )
inputs.file( svg )
outputs.file( png )
commandLine "rsvg-convert", "-z", scale, "-o", png, svg
...
...
@@ -97,10 +97,10 @@ android
sourceSets
{
main.assets.srcDirs = [ "assets" ]
main.java.srcDirs = [
"@srcdir@"
]
main.java.srcDirs = [
srcdir
]
main.jniLibs.srcDirs = [ "lib" ]
main.java.excludes = [ "build" ]
main.res.srcDirs = [ "res" ]
main.manifest.srcFile
"@srcdir@
/AndroidManifest.xml"
main.manifest.srcFile
srcdir + "
/AndroidManifest.xml"
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment