mirror of
https://github.com/Z3Prover/z3
synced 2025-04-15 13:28:47 +00:00
Java API: build fixes
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
This commit is contained in:
parent
aa4fe775b1
commit
29b896b0bf
|
@ -985,7 +985,10 @@ class JavaDLLComponent(Component):
|
||||||
else:
|
else:
|
||||||
t = t.replace('PLATFORM', 'win32')
|
t = t.replace('PLATFORM', 'win32')
|
||||||
out.write(t)
|
out.write(t)
|
||||||
out.write('\t$(SLINK) $(SLINK_OUT_FLAG)libz3java$(SO_EXT) $(SLINK_FLAGS) Native$(OBJ_EXT) libz3$(LIB_EXT)\n')
|
if IS_WINDOWS: # On Windows, CL creates a .lib file to link against.
|
||||||
|
out.write('\t$(SLINK) $(SLINK_OUT_FLAG)libz3java$(SO_EXT) $(SLINK_FLAGS) api/java/Native$(OBJ_EXT) libz3$(LIB_EXT)\n')
|
||||||
|
else:
|
||||||
|
out.write('\t$(SLINK) $(SLINK_OUT_FLAG)libz3java$(SO_EXT) $(SLINK_FLAGS) api/java/Native$(OBJ_EXT) libz3$(SO_EXT)\n')
|
||||||
out.write('%s.jar: libz3java$(SO_EXT) ' % self.package_name)
|
out.write('%s.jar: libz3java$(SO_EXT) ' % self.package_name)
|
||||||
# for java_file in get_java_files(self.src_dir):
|
# for java_file in get_java_files(self.src_dir):
|
||||||
# out.write('%s ' % java_file)
|
# out.write('%s ' % java_file)
|
||||||
|
|
|
@ -537,8 +537,9 @@ def mk_java():
|
||||||
java_wrapper.write('#ifdef __cplusplus\n')
|
java_wrapper.write('#ifdef __cplusplus\n')
|
||||||
java_wrapper.write('extern "C" {\n')
|
java_wrapper.write('extern "C" {\n')
|
||||||
java_wrapper.write('#endif\n')
|
java_wrapper.write('#endif\n')
|
||||||
|
pkg_str = get_component('java').package_name.replace('.', '_')
|
||||||
for name, result, params in _dotnet_decls:
|
for name, result, params in _dotnet_decls:
|
||||||
java_wrapper.write('JNIEXPORT %s JNICALL Java_Z3Native_%s(JNIEnv * jenv, jclass cls' % (type2javaw(result), java_method_name(name)))
|
java_wrapper.write('JNIEXPORT %s JNICALL Java_%s_Native_%s(JNIEnv * jenv, jclass cls' % (type2javaw(result), pkg_str, java_method_name(name)))
|
||||||
i = 0;
|
i = 0;
|
||||||
for param in params:
|
for param in params:
|
||||||
java_wrapper.write(', ')
|
java_wrapper.write(', ')
|
||||||
|
|
Loading…
Reference in a new issue