added platform support (i686, x64)

germanysources · Sep 13, 2019 · 3bdf3c9 · 3bdf3c9
1 parent 1ad0268
commit 3bdf3c9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/fosss.py b/fosss.py
@@ -52,7 +52,7 @@ def execute(cmd_parts):
 
 execute([
     'java -cp \"%s\"' % classpath_sep.join(jars),
-    '-Djava.library.path=.',
+    '-Djava.library.path=%s' % platform.machine(),
     '-Djava.util.logging.config.file=log.properties',
     javaclass,
     searchTerm,

diff --git a/make.py b/make.py
@@ -48,13 +48,18 @@ def execute(cmd_parts):
 
 execute([javah, '-classpath', classpath, '-o', HeaderFile, 'org.RepositorySearch.Console'])
 
+#make directory for compiled-library
+if not os.access(platform.machine(), os.F_OK):
+    os.mkdir(platform.machine())
+
+
 output = ''
 gcc_command = ''
 if is_windows:
-    output = 'ConsoleWidth.dll'
+    output = join(platform.machine(), 'ConsoleWidth.dll')
     gcc_command = 'gcc -Wl,--add-stdcall-alias'
 else:
-    output = 'libConsoleWidth.so'
+    output = join(platform.machine(), 'libConsoleWidth.so')
     gcc_command = 'gcc -std=c99 -fPIC'
 
 execute([gcc_command,  

diff --git a/runMain.py b/runMain.py
@@ -49,7 +49,7 @@ def execute(cmd_parts):
 
 execute([
     'java -cp \"%s\"' % classpath_sep.join(jars),
-    '-Djava.library.path=.',
+    '-Djava.library.path=%s' % platform.machine(),
     '-Djava.util.logging.config.file=log.properties',
     javaclass,
     searchTerm,