remove library/gui source trees, put everything under src/

src/Core.cc

@@ -1,4 +1,4 @@
-#include "jes/Core.h"
+#include "Core.h"
 
 namespace jes
 {

src/Core.h

@@ -1,8 +1,8 @@
 #ifndef JES_CORE_H
 #define JES_CORE_H
 
-#include "jes/Ref.h"
-#include "jes/Path.h"
+#include "Ref.h"
+#include "Path.h"
 #include <string>
 
 #ifdef _WIN32

src/FileLoader.cc

@@ -1,7 +1,6 @@
-#include "jes.h"
-#include "jes/FileLoader.h"
-#include "jes/FileReader.h"
-#include "jes/Text.h"
+#include "FileLoader.h"
+#include "FileReader.h"
+#include "Text.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

src/FileLoader.h

@@ -1,8 +1,8 @@
 #ifndef JES_FILELOADER_H
 #define JES_FILELOADER_H
 
-#include "jes/Ref.h"
-#include "jes/Text.h"
+#include "Ref.h"
+#include "Text.h"
 #include <stdint.h>
 #include <vector>
 

src/FileReader.cc

@@ -1,5 +1,4 @@
-#include "jes.h"
-#include "jes/FileReader.h"
+#include "FileReader.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>

src/FileReader.h

@@ -1,7 +1,8 @@
 #ifndef JES_FILEREADER_H
 #define JES_FILEREADER_H
 
-#include "jes/Ref.h"
+#include "Core.h"
+#include "Ref.h"
 #include <stdint.h>
 
 namespace jes

src/Font.h

@@ -1,7 +1,7 @@
 #ifndef JES_FONT_H
 #define JES_FONT_H
 
-#include "jes/Ref.h"
+#include "Ref.h"
 #include <ft2build.h>
 #include FT_FREETYPE_H
 #include "gl3w.h"

src/FontManager.cc

@@ -1,5 +1,5 @@
 #include "FontManager.h"
-#include "jes/Runtime.h"
+#include "Runtime.h"
 #include <iostream>
 
 namespace jes

src/FontManager.h

@@ -1,7 +1,7 @@
 #ifndef JES_FONTMANAGER_H
 #define JES_FONTMANAGER_H
 
-#include "jes/Ref.h"
+#include "Ref.h"
 #include "Font.h"
 #include <ft2build.h>
 #include FT_FREETYPE_H

src/GLBuffer.h

@@ -1,8 +1,8 @@
 #ifndef GLBUFFER_H
 #define GLBUFFER_H
 
+#include "Ref.h"
 #include "gl3w.h"
-#include "jes.h"
 
 namespace jes
 {

src/GLProgram.h

@@ -1,7 +1,7 @@
 #ifndef GLPROGRAM_H
 #define GLPROGRAM_H
 
-#include "jes/Ref.h"
+#include "Ref.h"
 #include "GLShader.h"
 #include <map>
 #include <string>

src/GLShader.h

@@ -1,8 +1,8 @@
 #ifndef GLSHADER_H
 #define GLSHADER_H
 
-#include "jes/Ref.h"
-#include "jes/Path.h"
+#include "Ref.h"
+#include "Path.h"
 #include "gl3w.h"
 
 namespace jes

src/GLTexture.h

@@ -1,7 +1,7 @@
 #ifndef GLTEXTURE_H
 #define GLTEXTURE_H
 
-#include "jes/Ref.h"
+#include "Ref.h"
 #include "gl3w.h"
 #include <stdint.h>
 

src/GUI.cc

@@ -1,7 +1,7 @@
 #include "GUI.h"
 #include "gl3w.h"
 #include <iostream>
-#include "jes/Runtime.h"
+#include "Runtime.h"
 
 #define WIDTH   500
 #define HEIGHT  500

src/GUI.h

@@ -1,7 +1,7 @@
 #ifndef JES_GUI_H
 #define JES_GUI_H
 
-#include "jes/Ref.h"
+#include "Ref.h"
 #include <SDL.h>
 #include "FontManager.h"
 #include "GLProgram.h"

src/Path.cc

@@ -1,5 +1,5 @@
-#include "jes/Path.h"
-#include "jes/FileReader.h"
+#include "Path.h"
+#include "FileReader.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>

src/Path.h

@@ -1,7 +1,7 @@
 #ifndef JES_PATH_H
 #define JES_PATH_H
 
-#include "jes/Ref.h"
+#include "Ref.h"
 #include <string>
 #include <vector>
 #include <stdint.h>

src/Runtime.cc

@@ -1,4 +1,4 @@
-#include "jes/Runtime.h"
+#include "Runtime.h"
 
 namespace jes
 {

src/Runtime.h

@@ -1,8 +1,8 @@
 #ifndef JES_RUNTIME_H
 #define JES_RUNTIME_H
 
-#include "jes/Core.h"
-#include "jes/Path.h"
+#include "Core.h"
+#include "Path.h"
 
 namespace jes
 {

src/Text.cc

@@ -1,4 +1,4 @@
-#include "jes/Text.h"
+#include "Text.h"
 #include <string.h>
 
 namespace jes

src/Text.h

@@ -2,7 +2,7 @@
 #define JES_TEXT_H
 
 #include <stdint.h>
-#include "jes/Ref.h"
+#include "Ref.h"
 #include <string>
 
 namespace jes

src/lib/include/jes.h

@@ -1,15 +0,0 @@
-#ifndef JES_H
-#define JES_H
-
-#include "jes/Core.h"
-#include "jes/Ref.h"
-
-namespace jes
-{
-    static inline void JES_Init(const std::string & bin_path)
-    {
-        Core::instance.init(bin_path);
-    }
-}
-
-#endif

src/main.cc

@@ -1,7 +1,7 @@
 #include <iostream>
 #include "GUI.h"
 
-#include "jes.h"
+#include "Core.h"
 
 using namespace std;