Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
28637d54
Commit
28637d54
authored
Jun 13, 2006
by
Filippo Carone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
another attempt to make java bindings win32 friendly.
parent
09458513
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
5 deletions
+22
-5
bindings/java/Makefile.am
bindings/java/Makefile.am
+12
-4
bindings/java/vlc-graphics-jni.cc
bindings/java/vlc-graphics-jni.cc
+10
-1
No files found.
bindings/java/Makefile.am
View file @
28637d54
...
...
@@ -13,8 +13,10 @@ JINCLUDES = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/win32
LIBJINCLUDES
=
-L
${JAVA_HOME}
/lib
-ljawt
JCC
=
javac
JCH
=
javah
JAVA_CC_FLAGS
=
#CXX = g++ -Wall -mno-cygwin -g
#LDFLAGS = -mno-cygwin `vlc-config --libs external pic` -Wl,--kill-at
JAVACXXFLAGS
=
`
top_builddir
=
../.. ../../vlc-config
--cflags
pic
`
-I
../../
-I
../../include
$(JINCLUDES)
JAVALDFLAGS
=
-mno-cygwin
-L
../../src
-lvlc
`
top_builddir
=
../.. ../../vlc-config
--libs
builtin
vlc pic
`
-Wl
,--kill-at
else
JINCLUDES
=
-I
$(JAVA_HOME)
/include
-I
$(JAVA_HOME)
/include/linux
...
...
@@ -23,6 +25,7 @@ JCC = gcj -g
JCH
=
gcjh
-jni
SWT_PATH
=
/usr/share/java
# Compile flags
JAVA_CC_FLAGS
=
-C
JAVACXXFLAGS
=
`
top_builddir
=
../.. ../../vlc-config
--cflags
pic
`
-I
../../
-I
../../include
$(JINCLUDES)
JAVALDFLAGS
=
-L
../../src
-lvlc
`
top_builddir
=
../.. ../../vlc-config
--libs
builtin
vlc pic
`
endif
...
...
@@ -32,7 +35,7 @@ all: libjvlc.so VlcClient VLCExample
if
HAVE_WIN32
libjvlc.so
:
vlc-libvlc-jni.o vlc-graphics-jni.o
$(CXX)
-shared
vlc-libvlc-jni.o vlc-graphics-jni.o
$(LIBJINCLUDES)
$(LDFLAGS)
-o
jvlc.dll
$(CXX)
-shared
vlc-libvlc-jni.o vlc-graphics-jni.o
$(LIBJINCLUDES)
$(LDFLAGS)
$(JAVALDFLAGS)
-o
jvlc.dll
else
libjvlc.so
:
vlc-libvlc-jni.o vlc-graphics-jni.o
$(CXX)
-shared
vlc-libvlc-jni.o vlc-graphics-jni.o
$(LIBJINCLUDES)
$(LDFLAGS)
$(JAVALDFLAGS)
-o
libjvlc.so
...
...
@@ -45,13 +48,18 @@ vlc-libvlc-jni.o: VlcClient
$(CXX)
-c
vlc-libvlc-jni.cc
$(CXXFLAGS)
$(JAVACXXFLAGS)
VlcClient
:
$(OBJECTS)
$(JCC)
-C
VlcClient.java
$(JCC)
$(JAVA_CC_FLAGS)
VlcClient.java
VLCExample
:
$(OBJECTS)
$(JCC)
-C
VLCExample.java
$(JCC)
$(JAVA_CC_FLAGS)
VLCExample.java
if
HAVE_WIN32
%.class
:
%.java
$(JCC)
$(JAVA_CC_FLAGS)
$?
$(JCH)
org.videolan.jvlc.
$
(
*
F
)
else
%.class
:
%.java
$(JCC)
-C
$?
$(JCC)
$(JAVA_CC_FLAGS)
$?
$(JCH)
org/videolan/jvlc/
$
(
*
F
)
clean
:
...
...
bindings/java/vlc-graphics-jni.cc
View file @
28637d54
...
...
@@ -26,7 +26,10 @@
#include <jawt.h>
#include <jawt_md.h>
#ifndef WIN32
#include <X11/Xlib.h> // for Xlibs graphics functions
#endif
#include <stdio.h> // for printf
/* JVLC internal imports, generated by gcjh */
...
...
@@ -41,10 +44,16 @@ JNIEXPORT void JNICALL Java_org_videolan_jvlc_JVLCCanvas_paint (JNIEnv *env, job
JAWT
awt
;
JAWT_DrawingSurface
*
ds
;
JAWT_DrawingSurfaceInfo
*
dsi
;
#ifdef WIN32
JAWT_Win32DrawingSurfaceInfo
*
dsi_win
;
#else
JAWT_X11DrawingSurfaceInfo
*
dsi_x11
;
GC
gc
;
#endif
jint
lock
;
GC
gc
;
vlc_value_t
value
;
...
...
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