Cleanup imports

2018-06-11 14:19:37 -07:00
parent f6e38208d3
commit 58057a4457
27 changed files with 29 additions and 26 deletions
--- a/project/Build.xml
+++ b/project/Build.xml
@@ -427,6 +427,9 @@
 				<lib name="/opt/local/lib/libgc.a" if="LIME_NEKO" />
 				<lib name="-lm" if="LIME_NEKO" />
 				
+				<lib name="-L${HLPATH}" />
+				<lib name="-lhl" if="LIME_HASHLINK" />
+				
 			</section>
 			
 			<section if="android">
--- a/project/include/app/Application.h
+++ b/project/include/app/Application.h
@@ -2,7 +2,7 @@
 #define LIME_APP_APPLICATION_H


-#include <hx/CFFI.h>
+#include <system/CFFI.h>


 namespace lime {
--- a/project/include/graphics/Renderer.h
+++ b/project/include/graphics/Renderer.h
@@ -4,8 +4,8 @@

 #include <graphics/ImageBuffer.h>
 #include <math/Rectangle.h>
+#include <system/CFFI.h>
 #include <ui/Window.h>
-#include <hx/CFFI.h>


 namespace lime {
--- a/project/include/graphics/utils/ImageDataUtil.h
+++ b/project/include/graphics/utils/ImageDataUtil.h
@@ -2,12 +2,12 @@
 #define LIME_GRAPHICS_UTILS_IMAGE_DATA_UTIL_H


-#include <hx/CFFI.h>
 #include <graphics/Image.h>
 #include <graphics/PixelFormat.h>
 #include <math/ColorMatrix.h>
 #include <math/Rectangle.h>
 #include <math/Vector2.h>
+#include <system/CFFI.h>
 #include <system/Endian.h>
 #include <system/System.h>
 #include <utils/Bytes.h>
--- a/project/include/math/ColorMatrix.h
+++ b/project/include/math/ColorMatrix.h
@@ -2,7 +2,7 @@
 #define LIME_MATH_COLOR_MATRIX_H


-#include <hx/CFFI.h>
+#include <system/CFFI.h>
 #include <system/System.h>
 #include <stdint.h>

--- a/project/include/media/AudioBuffer.h
+++ b/project/include/media/AudioBuffer.h
@@ -2,7 +2,7 @@
 #define LIME_MEDIA_AUDIO_BUFFER_H


-#include <hx/CFFI.h>
+#include <system/CFFI.h>
 #include <utils/ArrayBufferView.h>

 #ifdef ANDROID
--- a/project/include/system/DisplayMode.h
+++ b/project/include/system/DisplayMode.h
@@ -2,8 +2,8 @@
 #define LIME_SYSTEM_DISPLAY_MODE_H


-#include <hx/CFFI.h>
 #include <graphics/PixelFormat.h>
+#include <system/CFFI.h>


 namespace lime {
--- a/project/include/system/FileWatcher.h
+++ b/project/include/system/FileWatcher.h
@@ -5,8 +5,8 @@
 #undef RemoveDirectory
 #endif

+#include <system/CFFI.h>
 #include <system/Mutex.h>
-#include <hx/CFFI.h>
 #include <map>
 #include <string>
 #include <vector>
--- a/project/include/system/System.h
+++ b/project/include/system/System.h
@@ -1,7 +1,7 @@
 #ifndef LIME_SYSTEM_SYSTEM_H
 #define LIME_SYSTEM_SYSTEM_H

-#include <hx/CFFI.h>
+#include <system/CFFI.h>
 #include <stdio.h>
 #include <string>

--- a/project/include/text/Font.h
+++ b/project/include/text/Font.h
@@ -3,9 +3,9 @@


 #include <graphics/ImageBuffer.h>
+#include <system/CFFI.h>
 #include <system/System.h>
 #include <utils/Resource.h>
-#include <hx/CFFI.h>

 #ifdef HX_WINDOWS
 #undef GetGlyphIndices
--- a/project/src/app/ApplicationEvent.cpp
+++ b/project/src/app/ApplicationEvent.cpp
@@ -1,5 +1,5 @@
-#include <hx/CFFI.h>
 #include <app/ApplicationEvent.h>
+#include <system/CFFI.h>


 namespace lime {
--- a/project/src/graphics/RenderEvent.cpp
+++ b/project/src/graphics/RenderEvent.cpp
@@ -1,5 +1,5 @@
-#include <hx/CFFI.h>
 #include <graphics/RenderEvent.h>
+#include <system/CFFI.h>


 namespace lime {
--- a/project/src/graphics/opengl/OpenGLBindings.cpp
+++ b/project/src/graphics/opengl/OpenGLBindings.cpp
@@ -1,4 +1,4 @@
-#include <hx/CFFIPrime.h>
+#include <system/CFFI.h>
 #include <system/CFFIPointer.h>
 #include <system/Mutex.h>
 #include <utils/Bytes.h>
--- a/project/src/media/codecs/vorbis/VorbisBindings.cpp
+++ b/project/src/media/codecs/vorbis/VorbisBindings.cpp
@@ -1,5 +1,5 @@
-#include <hx/CFFIPrime.h>
 #include <media/codecs/vorbis/VorbisFile.h>
+#include <system/CFFI.h>
 #include <system/CFFIPointer.h>
 #include <utils/Bytes.h>

--- a/project/src/net/curl/CURLBindings.cpp
+++ b/project/src/net/curl/CURLBindings.cpp
@@ -1,5 +1,5 @@
 #include <curl/curl.h>
-#include <hx/CFFIPrime.h>
+#include <system/CFFI.h>
 #include <system/CFFIPointer.h>
 #include <system/Mutex.h>
 #include <utils/Bytes.h>
--- a/project/src/system/ClipboardEvent.cpp
+++ b/project/src/system/ClipboardEvent.cpp
@@ -1,4 +1,4 @@
-#include <hx/CFFI.h>
+#include <system/CFFI.h>
 #include <system/ClipboardEvent.h>


--- a/project/src/system/JNI.cpp
+++ b/project/src/system/JNI.cpp
@@ -1,6 +1,6 @@
+#include <system/CFFI.h>
 #include <system/JNI.h>
 #include <utils/Object.h>
-#include <hx/CFFIPrime.h>
 #include <jni.h>
 #include <pthread.h>
 #include <android/log.h>
--- a/project/src/system/SensorEvent.cpp
+++ b/project/src/system/SensorEvent.cpp
@@ -1,4 +1,4 @@
-#include <hx/CFFI.h>
+#include <system/CFFI.h>
 #include <system/SensorEvent.h>


--- a/project/src/system/ValuePointer.cpp
+++ b/project/src/system/ValuePointer.cpp
@@ -1,4 +1,4 @@
-#include <hx/CFFI.h>
+#include <system/CFFI.h>
 #include <system/ValuePointer.h>


--- a/project/src/ui/DropEvent.cpp
+++ b/project/src/ui/DropEvent.cpp
@@ -1,4 +1,4 @@
-#include <hx/CFFI.h>
+#include <system/CFFI.h>
 #include <ui/DropEvent.h>


--- a/project/src/ui/GamepadEvent.cpp
+++ b/project/src/ui/GamepadEvent.cpp
@@ -1,4 +1,4 @@
-#include <hx/CFFI.h>
+#include <system/CFFI.h>
 #include <ui/GamepadEvent.h>


--- a/project/src/ui/JoystickEvent.cpp
+++ b/project/src/ui/JoystickEvent.cpp
@@ -1,4 +1,4 @@
-#include <hx/CFFI.h>
+#include <system/CFFI.h>
 #include <ui/JoystickEvent.h>


--- a/project/src/ui/KeyEvent.cpp
+++ b/project/src/ui/KeyEvent.cpp
@@ -1,4 +1,4 @@
-#include <hx/CFFI.h>
+#include <system/CFFI.h>
 #include <ui/KeyEvent.h>


--- a/project/src/ui/MouseEvent.cpp
+++ b/project/src/ui/MouseEvent.cpp
@@ -1,4 +1,4 @@
-#include <hx/CFFI.h>
+#include <system/CFFI.h>
 #include <ui/MouseEvent.h>


--- a/project/src/ui/TextEvent.cpp
+++ b/project/src/ui/TextEvent.cpp
@@ -1,4 +1,4 @@
-#include <hx/CFFI.h>
+#include <system/CFFI.h>
 #include <ui/TextEvent.h>


--- a/project/src/ui/TouchEvent.cpp
+++ b/project/src/ui/TouchEvent.cpp
@@ -1,4 +1,4 @@
-#include <hx/CFFI.h>
+#include <system/CFFI.h>
 #include <ui/TouchEvent.h>


--- a/project/src/ui/WindowEvent.cpp
+++ b/project/src/ui/WindowEvent.cpp
@@ -1,4 +1,4 @@
-#include <hx/CFFI.h>
+#include <system/CFFI.h>
 #include <ui/WindowEvent.h>