Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-1.1
Commits
b8241217
Commit
b8241217
authored
Mar 09, 2007
by
Filippo Carone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libjvlc.dll is created when crosscompiling
parent
e63c4f09
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
4 deletions
+18
-4
bindings/java/Makefile.am
bindings/java/Makefile.am
+1
-1
bindings/java/src/Makefile.am
bindings/java/src/Makefile.am
+17
-3
No files found.
bindings/java/Makefile.am
View file @
b8241217
...
@@ -39,7 +39,7 @@ PROCESSOR_FAMILY = `uname -m | sed -e 's/^i.86/i386/' | sed -e 's/^x86_64/amd64/
...
@@ -39,7 +39,7 @@ PROCESSOR_FAMILY = `uname -m | sed -e 's/^i.86/i386/' | sed -e 's/^x86_64/amd64/
if
HAVE_WIN32
if
HAVE_WIN32
JINCLUDES
=
-I
${JAVA_HOME}
/include
-I
${JAVA_HOME}
/include/win32
JINCLUDES
=
-I
${JAVA_HOME}
/include
-I
${JAVA_HOME}
/include/win32
LIBJINCLUDES
=
-L
${JAVA_HOME}
/
jre/bin
-l
awt
LIBJINCLUDES
=
-L
${JAVA_HOME}
/
lib
-lj
awt
JCH
=
javah
JCH
=
javah
else
else
JINCLUDES
=
-I
$(JAVA_HOME)
/include
-I
$(JAVA_HOME)
/include/linux
JINCLUDES
=
-I
$(JAVA_HOME)
/include
-I
$(JAVA_HOME)
/include/linux
...
...
bindings/java/src/Makefile.am
View file @
b8241217
...
@@ -26,11 +26,25 @@ endif
...
@@ -26,11 +26,25 @@ endif
if
HAVE_WIN32
if
HAVE_WIN32
DATA_noinst_libjvlc
=
libjvlc
$(LIBEXT)
libjvlc
$(LIBEXT)
.a
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)
libjvlcdir
=
$(srcdir)
$(DLLTOOL)
-z
libjvlc.def
-l
libjvlc.dll.a
-D
$<
$(libjvlc_a_OBJECTS)
#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
all
:
libjvlc.dll.a
endif
endif
...
...
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