Skip to content

Commit b1dd664

Browse files
efraespadaefraespada
committed
Revert "jni not working"
This reverts commit ec0b221.
1 parent 3dd6dba commit b1dd664

23 files changed

+68
-9137
lines changed

‎CMakeFiles/3.10.2/CMakeCCompiler.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,5 +69,5 @@ endif()
6969

7070

7171
set(CMAKE_C_IMPLICIT_LINK_LIBRARIES "")
72-
set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/usr/lib;/usr/local/lib")
73-
set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "/Library/Frameworks;/System/Library/Frameworks")
72+
set(CMAKE_C_IMPLICIT_LINK_DIRECTORIES "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/usr/lib")
73+
set(CMAKE_C_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks")

‎CMakeFiles/3.10.2/CMakeCXXCompiler.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,5 @@ endif()
7171

7272

7373
set(CMAKE_CXX_IMPLICIT_LINK_LIBRARIES "c++")
74-
set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/usr/lib;/usr/local/lib")
75-
set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "/Library/Frameworks;/System/Library/Frameworks")
74+
set(CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/usr/lib")
75+
set(CMAKE_CXX_IMPLICIT_LINK_FRAMEWORK_DIRECTORIES "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/System/Library/Frameworks")

‎CMakeFiles/CMakeDirectoryInformation.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
# Generated by "Unix Makefiles" Generator, CMake Version 3.10
33

44
# Relative path conversion top directories.
5-
set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/Users/efrainespada/Documents/Github/StringCare/AndroidPlugin")
6-
set(CMAKE_RELATIVE_PATH_TOP_BINARY "/Users/efrainespada/Documents/Github/StringCare/AndroidPlugin")
5+
set(CMAKE_RELATIVE_PATH_TOP_SOURCE "/Users/efraespada/Documents/Github/StringCare/AndroidPlugin")
6+
set(CMAKE_RELATIVE_PATH_TOP_BINARY "/Users/efraespada/Documents/Github/StringCare/AndroidPlugin")
77

88
# Force unix paths in dependencies.
99
set(CMAKE_FORCE_UNIX_PATHS 1)

‎CMakeFiles/CMakeOutput.log‎

Lines changed: 0 additions & 9044 deletions
Large diffs are not rendered by default.

‎CMakeFiles/Makefile2‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,10 +54,10 @@ RM = /usr/local/Cellar/cmake/3.10.2/bin/cmake -E remove -f
5454
EQUALS = =
5555

5656
# The top-level source directory on which CMake was run.
57-
CMAKE_SOURCE_DIR = /Users/efrainespada/Documents/Github/StringCare/AndroidPlugin
57+
CMAKE_SOURCE_DIR = /Users/efraespada/Documents/Github/StringCare/AndroidPlugin
5858

5959
# The top-level build directory on which CMake was run.
60-
CMAKE_BINARY_DIR = /Users/efrainespada/Documents/Github/StringCare/AndroidPlugin
60+
CMAKE_BINARY_DIR = /Users/efraespada/Documents/Github/StringCare/AndroidPlugin
6161

6262
#=============================================================================
6363
# Target rules for target CMakeFiles/malacaton-lib.dir
@@ -66,7 +66,7 @@ CMAKE_BINARY_DIR = /Users/efrainespada/Documents/Github/StringCare/AndroidPlugin
6666
CMakeFiles/malacaton-lib.dir/all:
6767
$(MAKE) -f CMakeFiles/malacaton-lib.dir/build.make CMakeFiles/malacaton-lib.dir/depend
6868
$(MAKE) -f CMakeFiles/malacaton-lib.dir/build.make CMakeFiles/malacaton-lib.dir/build
69-
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/Users/efrainespada/Documents/Github/StringCare/AndroidPlugin/CMakeFiles --progress-num=1,2 "Built target malacaton-lib"
69+
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/Users/efraespada/Documents/Github/StringCare/AndroidPlugin/CMakeFiles --progress-num=1,2 "Built target malacaton-lib"
7070
.PHONY : CMakeFiles/malacaton-lib.dir/all
7171

7272
# Include target in all.
@@ -76,9 +76,9 @@ all: CMakeFiles/malacaton-lib.dir/all
7676

7777
# Build rule for subdir invocation for target.
7878
CMakeFiles/malacaton-lib.dir/rule: cmake_check_build_system
79-
$(CMAKE_COMMAND) -E cmake_progress_start /Users/efrainespada/Documents/Github/StringCare/AndroidPlugin/CMakeFiles 2
79+
$(CMAKE_COMMAND) -E cmake_progress_start /Users/efraespada/Documents/Github/StringCare/AndroidPlugin/CMakeFiles 2
8080
$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/malacaton-lib.dir/all
81-
$(CMAKE_COMMAND) -E cmake_progress_start /Users/efrainespada/Documents/Github/StringCare/AndroidPlugin/CMakeFiles 0
81+
$(CMAKE_COMMAND) -E cmake_progress_start /Users/efraespada/Documents/Github/StringCare/AndroidPlugin/CMakeFiles 0
8282
.PHONY : CMakeFiles/malacaton-lib.dir/rule
8383

8484
# Convenience name for target.

‎CMakeFiles/TargetDirectories.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
/Users/efrainespada/Documents/Github/StringCare/AndroidPlugin/CMakeFiles/rebuild_cache.dir
2-
/Users/efrainespada/Documents/Github/StringCare/AndroidPlugin/CMakeFiles/edit_cache.dir
3-
/Users/efrainespada/Documents/Github/StringCare/AndroidPlugin/CMakeFiles/malacaton-lib.dir
1+
/Users/efraespada/Documents/Github/StringCare/AndroidPlugin/CMakeFiles/rebuild_cache.dir
2+
/Users/efraespada/Documents/Github/StringCare/AndroidPlugin/CMakeFiles/edit_cache.dir
3+
/Users/efraespada/Documents/Github/StringCare/AndroidPlugin/CMakeFiles/malacaton-lib.dir

‎CMakeFiles/malacaton-lib.dir/CXX.includecache‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66

77
#IncludeRegexTransform:
88

9-
/System/Library/Frameworks/JavaVM.framework/Headers/jni.h
9+
/Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/include/darwin/jni_md.h
10+
11+
/Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/include/jni.h
1012
stdio.h
1113
-
1214
stdarg.h
1315
-
1416
jni_md.h
15-
/System/Library/Frameworks/JavaVM.framework/Headers/jni_md.h
16-
17-
/System/Library/Frameworks/JavaVM.framework/Headers/jni_md.h
17+
/Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/include/jni_md.h
1818

19-
/Users/efrainespada/Documents/Github/StringCare/AndroidPlugin/src/main/cpp/malacaton-lib.cpp
19+
/Users/efraespada/Documents/Github/StringCare/AndroidPlugin/src/main/cpp/malacaton-lib.cpp
2020
jni.h
2121
-
2222
string

‎CMakeFiles/malacaton-lib.dir/DependInfo.cmake‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,14 @@ set(CMAKE_DEPENDS_LANGUAGES
44
)
55
# The set of files for implicit dependencies of each language:
66
set(CMAKE_DEPENDS_CHECK_CXX
7-
"/Users/efrainespada/Documents/Github/StringCare/AndroidPlugin/src/main/cpp/malacaton-lib.cpp" "/Users/efrainespada/Documents/Github/StringCare/AndroidPlugin/CMakeFiles/malacaton-lib.dir/src/main/cpp/malacaton-lib.cpp.o"
7+
"/Users/efraespada/Documents/Github/StringCare/AndroidPlugin/src/main/cpp/malacaton-lib.cpp" "/Users/efraespada/Documents/Github/StringCare/AndroidPlugin/CMakeFiles/malacaton-lib.dir/src/main/cpp/malacaton-lib.cpp.o"
88
)
99
set(CMAKE_CXX_COMPILER_ID "Clang")
1010

1111
# The include file search paths:
1212
set(CMAKE_CXX_TARGET_INCLUDE_PATH
13-
"/System/Library/Frameworks/JavaVM.framework/Headers"
13+
"/Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/include"
14+
"/Library/Java/JavaVirtualMachines/jdk1.8.0_121.jdk/Contents/Home/include/darwin"
1415
)
1516

1617
# Targets to which this target links.

‎CMakeFiles/malacaton-lib.dir/build.make‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ RM = /usr/local/Cellar/cmake/3.10.2/bin/cmake -E remove -f
4343
EQUALS = =
4444

4545
# The top-level source directory on which CMake was run.
46-
CMAKE_SOURCE_DIR = /Users/efrainespada/Documents/Github/StringCare/AndroidPlugin
46+
CMAKE_SOURCE_DIR = /Users/efraespada/Documents/Github/StringCare/AndroidPlugin
4747

4848
# The top-level build directory on which CMake was run.
49-
CMAKE_BINARY_DIR = /Users/efrainespada/Documents/Github/StringCare/AndroidPlugin
49+
CMAKE_BINARY_DIR = /Users/efraespada/Documents/Github/StringCare/AndroidPlugin
5050

5151
# Include any dependencies generated for this target.
5252
include CMakeFiles/malacaton-lib.dir/depend.make
@@ -59,16 +59,16 @@ include CMakeFiles/malacaton-lib.dir/flags.make
5959

6060
CMakeFiles/malacaton-lib.dir/src/main/cpp/malacaton-lib.cpp.o: CMakeFiles/malacaton-lib.dir/flags.make
6161
CMakeFiles/malacaton-lib.dir/src/main/cpp/malacaton-lib.cpp.o: src/main/cpp/malacaton-lib.cpp
62-
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/Users/efrainespada/Documents/Github/StringCare/AndroidPlugin/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object CMakeFiles/malacaton-lib.dir/src/main/cpp/malacaton-lib.cpp.o"
63-
/usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/malacaton-lib.dir/src/main/cpp/malacaton-lib.cpp.o -c /Users/efrainespada/Documents/Github/StringCare/AndroidPlugin/src/main/cpp/malacaton-lib.cpp
62+
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/Users/efraespada/Documents/Github/StringCare/AndroidPlugin/CMakeFiles --progress-num=$(CMAKE_PROGRESS_1) "Building CXX object CMakeFiles/malacaton-lib.dir/src/main/cpp/malacaton-lib.cpp.o"
63+
/usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/malacaton-lib.dir/src/main/cpp/malacaton-lib.cpp.o -c /Users/efraespada/Documents/Github/StringCare/AndroidPlugin/src/main/cpp/malacaton-lib.cpp
6464

6565
CMakeFiles/malacaton-lib.dir/src/main/cpp/malacaton-lib.cpp.i: cmake_force
6666
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/malacaton-lib.dir/src/main/cpp/malacaton-lib.cpp.i"
67-
/usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /Users/efrainespada/Documents/Github/StringCare/AndroidPlugin/src/main/cpp/malacaton-lib.cpp > CMakeFiles/malacaton-lib.dir/src/main/cpp/malacaton-lib.cpp.i
67+
/usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /Users/efraespada/Documents/Github/StringCare/AndroidPlugin/src/main/cpp/malacaton-lib.cpp > CMakeFiles/malacaton-lib.dir/src/main/cpp/malacaton-lib.cpp.i
6868

6969
CMakeFiles/malacaton-lib.dir/src/main/cpp/malacaton-lib.cpp.s: cmake_force
7070
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/malacaton-lib.dir/src/main/cpp/malacaton-lib.cpp.s"
71-
/usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /Users/efrainespada/Documents/Github/StringCare/AndroidPlugin/src/main/cpp/malacaton-lib.cpp -o CMakeFiles/malacaton-lib.dir/src/main/cpp/malacaton-lib.cpp.s
71+
/usr/bin/g++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /Users/efraespada/Documents/Github/StringCare/AndroidPlugin/src/main/cpp/malacaton-lib.cpp -o CMakeFiles/malacaton-lib.dir/src/main/cpp/malacaton-lib.cpp.s
7272

7373
CMakeFiles/malacaton-lib.dir/src/main/cpp/malacaton-lib.cpp.o.requires:
7474

@@ -88,14 +88,14 @@ malacaton__lib_OBJECTS = \
8888
# External object files for target malacaton-lib
8989
malacaton__lib_EXTERNAL_OBJECTS =
9090

91-
build/classes/groovy/main/libmalacaton-lib.dylib: CMakeFiles/malacaton-lib.dir/src/main/cpp/malacaton-lib.cpp.o
92-
build/classes/groovy/main/libmalacaton-lib.dylib: CMakeFiles/malacaton-lib.dir/build.make
93-
build/classes/groovy/main/libmalacaton-lib.dylib: CMakeFiles/malacaton-lib.dir/link.txt
94-
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/Users/efrainespada/Documents/Github/StringCare/AndroidPlugin/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Linking CXX shared library build/classes/groovy/main/libmalacaton-lib.dylib"
91+
jniLib/libmalacaton-lib.dylib: CMakeFiles/malacaton-lib.dir/src/main/cpp/malacaton-lib.cpp.o
92+
jniLib/libmalacaton-lib.dylib: CMakeFiles/malacaton-lib.dir/build.make
93+
jniLib/libmalacaton-lib.dylib: CMakeFiles/malacaton-lib.dir/link.txt
94+
@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/Users/efraespada/Documents/Github/StringCare/AndroidPlugin/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Linking CXX shared library jniLib/libmalacaton-lib.dylib"
9595
$(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/malacaton-lib.dir/link.txt --verbose=$(VERBOSE)
9696

9797
# Rule to build all files generated by this target.
98-
CMakeFiles/malacaton-lib.dir/build: build/classes/groovy/main/libmalacaton-lib.dylib
98+
CMakeFiles/malacaton-lib.dir/build: jniLib/libmalacaton-lib.dylib
9999

100100
.PHONY : CMakeFiles/malacaton-lib.dir/build
101101

@@ -108,6 +108,6 @@ CMakeFiles/malacaton-lib.dir/clean:
108108
.PHONY : CMakeFiles/malacaton-lib.dir/clean
109109

110110
CMakeFiles/malacaton-lib.dir/depend:
111-
cd /Users/efrainespada/Documents/Github/StringCare/AndroidPlugin && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /Users/efrainespada/Documents/Github/StringCare/AndroidPlugin /Users/efrainespada/Documents/Github/StringCare/AndroidPlugin /Users/efrainespada/Documents/Github/StringCare/AndroidPlugin /Users/efrainespada/Documents/Github/StringCare/AndroidPlugin /Users/efrainespada/Documents/Github/StringCare/AndroidPlugin/CMakeFiles/malacaton-lib.dir/DependInfo.cmake --color=$(COLOR)
111+
cd /Users/efraespada/Documents/Github/StringCare/AndroidPlugin && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /Users/efraespada/Documents/Github/StringCare/AndroidPlugin /Users/efraespada/Documents/Github/StringCare/AndroidPlugin /Users/efraespada/Documents/Github/StringCare/AndroidPlugin /Users/efraespada/Documents/Github/StringCare/AndroidPlugin /Users/efraespada/Documents/Github/StringCare/AndroidPlugin/CMakeFiles/malacaton-lib.dir/DependInfo.cmake --color=$(COLOR)
112112
.PHONY : CMakeFiles/malacaton-lib.dir/depend
113113

‎CMakeFiles/malacaton-lib.dir/cmake_clean.cmake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
file(REMOVE_RECURSE
22
"CMakeFiles/malacaton-lib.dir/src/main/cpp/malacaton-lib.cpp.o"
3-
"build/classes/groovy/main/libmalacaton-lib.pdb"
4-
"build/classes/groovy/main/libmalacaton-lib.dylib"
3+
"jniLib/libmalacaton-lib.pdb"
4+
"jniLib/libmalacaton-lib.dylib"
55
)
66

77
# Per-language clean rules from dependency scanning.

0 commit comments

Comments
 (0)