Browse Source

AtomicPlayer building

Josh Engebretson 11 years ago
parent
commit
e61620989a

+ 2 - 1
.gitignore

@@ -1,4 +1,5 @@
 
 *.user
 Bin/Atomic.d.ts
-Source/Atomic/Javascript/Modules/*
+Source/Atomic/Javascript/Modules/*
+AtomicEditor/*

+ 1 - 1
Source/Atomic/CMakeLists.txt

@@ -18,7 +18,7 @@ file (GLOB NAVIGATION_SOURCE Navigation/*.cpp Navigation/*.h)
 file (GLOB NETWORK_SOURCE Network/*.cpp Network/*.h)
 file (GLOB ENVIRONMENT_SOURCE Environment/*.cpp Environment/*.h)
 file (GLOB ATOMIC2D_SOURCE Atomic2D/*.cpp Atomic2D/*.h)
-file (GLOB JAVASCRIPT_SOURCE Javascript/*.cpp Javascript/*.h)
+file (GLOB JAVASCRIPT_SOURCE Javascript/*.cpp Javascript/*.h Javascript/Modules/*.cpp  Javascript/Modules/*.h )
 file (GLOB SCENE_SOURCE Scene/*.cpp Scene/*.h)
 file (GLOB UI_SOURCE UI/*.cpp UI/*.h)
 

+ 13 - 13
Source/Tools/AtomicPlayer/AtomicPlayer.cpp

@@ -20,26 +20,26 @@
 // THE SOFTWARE.
 //
 
-#include "../Atomic.h"
-#include "../Engine/Engine.h"
-#include "../IO/FileSystem.h"
-#include "../IO/Log.h"
-#include "../Core/Main.h"
-#include "../Core/ProcessUtils.h"
-#include "../Resource/ResourceCache.h"
-#include "../Resource/ResourceEvents.h"
+#include <Atomic/Atomic.h>
+#include <Atomic/Engine/Engine.h>
+#include <Atomic/IO/FileSystem.h>
+#include <Atomic/IO/Log.h>
+#include <Atomic/Core/Main.h>
+#include <Atomic/Core/ProcessUtils.h>
+#include <Atomic/Resource/ResourceCache.h>
+#include <Atomic/Resource/ResourceEvents.h>
 
 // Move me
-#include "../Environment/Environment.h"
+#include <Atomic/Environment/Environment.h>
 
-#include "../Javascript/Javascript.h"
-#include "../Javascript/JSFile.h"
+#include <Atomic/Javascript/Javascript.h>
+#include <Atomic/Javascript/JSFile.h>
 
 #include "AtomicPlayer.h"
 
-#include "../DebugNew.h"
+#include <Atomic/DebugNew.h>
 
-#include "../UI/TBUI.h"
+#include <Atomic/UI/TBUI.h>
 
 #ifdef EMSCRIPTEN
 

+ 1 - 1
Source/Tools/AtomicPlayer/AtomicPlayer.h

@@ -22,7 +22,7 @@
 
 #pragma once
 
-#include "../Engine/Application.h"
+#include <Atomic/Engine/Application.h>
 
 using namespace Atomic;
 

+ 10 - 0
Source/Tools/AtomicPlayer/CMakeLists.txt

@@ -0,0 +1,10 @@
+
+include_directories(${CMAKE_SOURCE_DIR}/Source)
+include_directories(${CMAKE_SOURCE_DIR}/Source/ThirdParty)
+
+# Define source files
+file (GLOB SOURCE_FILES *.cpp *.h )
+
+add_executable(AtomicPlayer ${SOURCE_FILES})
+
+target_link_libraries(AtomicPlayer ${ATOMIC_LINK_LIBRARIES})

+ 1 - 0
Source/Tools/CMakeLists.txt

@@ -1,4 +1,5 @@
 
 add_subdirectory(JSBind)
+add_subdirectory(AtomicPlayer)
 
 

+ 1 - 1
Source/Tools/JSBind/modules/Graphics.json

@@ -1,6 +1,6 @@
 {
 	"name" : "Graphics",
-	"sources" : ["Graphics", "Graphics/Direct3D9"],
+	"sources" : ["Graphics", "Graphics/OpenGL"],
 	"includes" : ["../../Scene/Scene.h", "../../Graphics/Animation.h", "../../Graphics/OcclusionBuffer.h", "../../Scene/ValueAnimation.h"],
 	"classes" : ["Graphics", "Texture", "Texture2D", "Model", "Material", "Drawable", 
 				 "Viewport", "Renderer", "Octree", "Zone", "StaticModel", "Camera", "Light", "RenderPath",