Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VLC
Manage
Activity
Members
Labels
Plan
Issues
4k
Issue boards
Milestones
Code
Merge requests
454
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Contributor analytics
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
VideoLAN
VLC
Commits
b8241217
Commit
b8241217
authored
18 years ago
by
littlejohn
Browse files
Options
Downloads
Patches
Plain Diff
libjvlc.dll is created when crosscompiling
parent
e63c4f09
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
bindings/java/Makefile.am
+1
-1
1 addition, 1 deletion
bindings/java/Makefile.am
bindings/java/src/Makefile.am
+17
-3
17 additions, 3 deletions
bindings/java/src/Makefile.am
with
18 additions
and
4 deletions
bindings/java/Makefile.am
+
1
−
1
View file @
b8241217
...
...
@@ -39,7 +39,7 @@ PROCESSOR_FAMILY = `uname -m | sed -e 's/^i.86/i386/' | sed -e 's/^x86_64/amd64/
if
HAVE_WIN32
JINCLUDES
=
-I
${
JAVA_HOME
}
/include
-I
${
JAVA_HOME
}
/include/win32
LIBJINCLUDES
=
-L
${
JAVA_HOME
}
/
jre/bin
-lawt
LIBJINCLUDES
=
-L
${
JAVA_HOME
}
/
lib
-l
j
awt
JCH
=
javah
else
JINCLUDES
=
-I
$(
JAVA_HOME
)
/include
-I
$(
JAVA_HOME
)
/include/linux
...
...
This diff is collapsed.
Click to expand it.
bindings/java/src/Makefile.am
+
17
−
3
View file @
b8241217
...
...
@@ -26,11 +26,25 @@ endif
if
HAVE_WIN32
DATA_noinst_libjvlc
=
libjvlc
$(
LIBEXT
)
libjvlc
$(
LIBEXT
)
.a
LIBRARIES_libvlc
=
$(
top_builddir
)
/src/libvlc.dll.a
libjvlc_a_DEPENDENCIES
=
libjvlc.def
$(
LIBRARIES_libvlc
)
LDFLAGS_jvlc
=
`
$(
VLC_CONFIG
)
--libs
libvlc
`
libjvlc_DATA
=
libjvlc
$(
LIBEXT
)
libjvlc.dll.a libjvlc.def
:
libjvlc$(LIBEXT)
$(
DLLTOOL
)
-z
libjvlc.def
-l
libjvlc.dll.a
-D
$<
$(
libjvlc_a_OBJECTS
)
libjvlcdir
=
$(
srcdir
)
#libjvlc.dll.a libjvlc.def: libjvlc$(LIBEXT)
# $(DLLTOOL) -z libjvlc.def -l libjvlc.dll.a -D $< $(libjvlc_a_OBJECTS)
libjvlc$(LIBEXT)
:
$(libjvlc_a_OBJECTS)
\
$(libjvlc_a_DEPENDENCIES)
$(
CXXLINK
)
$(
libjvlc_a_OBJECTS
)
\
$(
srcdir
)
/libjvlc.def
\
$(
LIBRARIES_libvlc
)
-shared
$(
LIBRARIES_libvlc
)
$(
LIBJINCLUDES
)
$(
LDFLAGS_jvlc
)
\
$(
INCLUDED_LIBINTL
)
# Cygwin work-around, copied by other makefiles
@if
test
-f
"$@.exe"
;
then
mv
-f
"$@.exe"
"$@"
;
fi
libjvlc$(LIBEXT)
:
$(libjvlc_a_OBJECTS)
all
:
libjvlc.dll.a
endif
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment