Fixed the project; settings were missing and some files were incomple…

…te for building DLLs

Former-commit-id: a58cac6022cd85239e21706980da725d6fa0caf9 [formerly 98c61e43a111ef6cd801c704c24db8cf3b101c94 [formerly 7ce605e]]
Former-commit-id: 759399a
Former-commit-id: b24bcb0

Brickware-Engine.sdf.REMOVED.git-id

@@ -1 +1 @@
-cdf2189169da32c10a00f57cdf15b4bf28e041fa
+dc1212fc82468113fe5b62c2ba616530e858aede

Brickware-Engine.sln

@@ -4,10 +4,17 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BrickwareCore", "BrickwareCore\BrickwareCore.vcxproj", "{0D642E01-B540-4F46-A6D7-DC45FEFB3856}"
+	ProjectSection(ProjectDependencies) = postProject
+		{DFAA7187-7C60-4205-A091-3388D1459E46} = {DFAA7187-7C60-4205-A091-3388D1459E46}
+	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BrickwareMath", "BrickwareMath\BrickwareMath.vcxproj", "{DFAA7187-7C60-4205-A091-3388D1459E46}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BrickwareTest", "BrickwareTest\BrickwareTest.vcxproj", "{502909B0-A870-47CC-8239-0AC4BF736DA3}"
+	ProjectSection(ProjectDependencies) = postProject
+		{0D642E01-B540-4F46-A6D7-DC45FEFB3856} = {0D642E01-B540-4F46-A6D7-DC45FEFB3856}
+		{DFAA7187-7C60-4205-A091-3388D1459E46} = {DFAA7187-7C60-4205-A091-3388D1459E46}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

BrickwareCore/BrickwareCore.vcxproj

@@ -16,7 +16,7 @@
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
     <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
@@ -44,11 +44,11 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <AdditionalIncludeDirectories>$(SolutionDir)\GLFW\include;$(SolutionDir)\GL\include;$(SolutionDir)\BrickwareMath\include;$(SolutionDir)\BrickwareCore\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(SolutionDir)\GLFW\include;$(SolutionDir)\GL\include;$(SolutionDir)\BrickwareMath\include;$(ProjectDir)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalDependencies>dxguid.lib;d3d11.lib;d3dcompiler.lib;BrickwareMath.lib;glew32.lib;glfw3dll.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>dxguid.lib;d3d11.lib;d3dcompiler.lib;BrickwareMath.lib;glew32.lib;glfw3dll.lib;opengl32.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <AdditionalLibraryDirectories>$(ProjectDir)\lib;$(SolutionDir)\GL\lib\Win32;$(SolutionDir)\GLFW\lib\Win32</AdditionalLibraryDirectories>
     </Link>
     <PreBuildEvent>
@@ -78,6 +78,8 @@
   <ItemGroup>
     <ClInclude Include="include\Bounds.h" />
     <ClInclude Include="include\BoxCollider.h" />
+    <ClInclude Include="include\BrickwareCore.h" />
+    <ClInclude Include="include\BrickwareCoreDLL.h" />
     <ClInclude Include="include\Camera.h" />
     <ClInclude Include="include\Collider.h" />
     <ClInclude Include="include\Component.h" />

BrickwareCore/BrickwareCore.vcxproj.filters

@@ -83,6 +83,12 @@
     <ClInclude Include="include\FrustumCollider.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="include\BrickwareCore.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="include\BrickwareCoreDLL.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\Bounds.cpp">

BrickwareCore/Debug/BrickwareCore.Build.CppClean.log

@@ -1,3 +1,5 @@
+d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\debug\brickwarecore.lib
+d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\debug\brickwarecore.exp
 d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\brickwarecore\debug\vc120.pdb
 d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\brickwarecore\debug\vc120.idb
 d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\brickwarecore\debug\input.obj
@@ -29,10 +31,13 @@ d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\brickwarecore\debug\
 d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\brickwarecore\debug\frustumcollider.obj
 d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\brickwarecore\debug\game.obj
 d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\brickwarecore\debug\gameobject.obj
-d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\debug\brickwarecore.lib
+d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\debug\brickwarecore.ilk
+d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\debug\brickwarecore.dll
+d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\debug\brickwarecore.pdb
+d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\brickwarecore\debug\brickwarecore.tlog\brickwarecore.write.1u.tlog
 d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\brickwarecore\debug\brickwarecore.tlog\cl.command.1.tlog
 d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\brickwarecore\debug\brickwarecore.tlog\cl.read.1.tlog
 d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\brickwarecore\debug\brickwarecore.tlog\cl.write.1.tlog
-d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\brickwarecore\debug\brickwarecore.tlog\lib-link.read.1.tlog
-d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\brickwarecore\debug\brickwarecore.tlog\lib-link.write.1.tlog
-d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\brickwarecore\debug\brickwarecore.tlog\lib.command.1.tlog
+d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\brickwarecore\debug\brickwarecore.tlog\link.command.1.tlog
+d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\brickwarecore\debug\brickwarecore.tlog\link.read.1.tlog
+d:\users\amt3824\cygwin64\home\amt3824\git\brickware-engine\brickwarecore\debug\brickwarecore.tlog\link.write.1.tlog

BrickwareCore/Debug/BrickwareCore.log

@@ -1,4 +1,4 @@
-Build started 2/11/2015 12:50:29 AM.
+Build started 2/12/2015 6:51:03 PM.
 
 Build succeeded.
 

BrickwareCore/include/Bounds.h

@@ -1,9 +1,11 @@
 #ifndef BOUNDS_H
 #define BOUNDS_H
 
+#include "BrickwareCoreDLL.h"
+
 #include "Vector3.h"
 
-class Bounds
+class BRICKWARE_CORE_API Bounds
 {
 public:
 	Bounds(Vector3 center, float width);

BrickwareCore/include/BoxCollider.h

@@ -1,9 +1,11 @@
 #ifndef BOXCOLLIDER_H
 #define BOXCOLLIDER_H
 
+#include "BrickwareCoreDLL.h"
+
 #include "Collider.h"
 
-class BoxCollider : public Collider
+class BRICKWARE_CORE_API BoxCollider : public Collider
 {
 public:
 	BoxCollider(float width);

BrickwareCore/include/BrickwareCore.h

@@ -0,0 +1,27 @@
+#ifndef BRICKWARE_CORE_H
+#define BRICKWARE_CORE_H
+
+#include "Bounds.h"
+#include "BoxCollider.h"
+#include "Camera.h"
+#include "Collider.h"
+#include "Component.h"
+#include "FrustumCollider.h"
+#include "Game.h"
+#include "GameObject.h"
+#include "Input.h"
+#include "Light.h"
+#include "Material.h"
+#include "Mesh.h"
+#include "MeshRenderer.h"
+#include "Octree.h"
+#include "Rigidbody.h"
+#include "Screen.h"
+#include "Settings.h"
+#include "Shader.h"
+#include "SphereCollider.h"
+#include "Texture.h"
+#include "Transform.h"
+#include "Utils.h"
+
+#endif

BrickwareCore/include/BrickwareCoreDLL.h

@@ -0,0 +1,10 @@
+#ifndef BRICKWARE_CORE_DLL_H
+#define BRICKWARE_CORE_DLL_H
+
+#ifdef BRICKWARE_CORE_EXPORTS
+#define BRICKWARE_CORE_API __declspec(dllexport)
+#else
+#define BRICKWARE_CORE_API __declspec(dllimport)
+#endif
+
+#endif

BrickwareCore/include/Camera.h

@@ -1,6 +1,8 @@
 #ifndef CAMERA_H
 #define CAMERA_H
 
+#include "BrickwareCoreDLL.h"
+
 #define _USE_MATH_DEFINES
 
 #include <iostream>
@@ -27,7 +29,7 @@
 #include "Octree.h"
 #include "GameObject.h"
 
-class Camera : public Component
+class BRICKWARE_CORE_API Camera : public Component
 {
 public:
 	Octree* renderingOctree;

BrickwareCore/include/Collider.h

@@ -1,6 +1,8 @@
 #ifndef COLLIDER_H
 #define COLLIDER_H
 
+#include "BrickwareCoreDLL.h"
+
 #include <vector>
 
 #include "Vector3.h"
@@ -12,7 +14,7 @@ class Bounds;
 
 #include "Component.h"
 
-class Collider : public Component
+class BRICKWARE_CORE_API Collider : public Component
 {
 public:
 	Collider();

BrickwareCore/include/Component.h

@@ -1,14 +1,16 @@
 #ifndef COMPONENT_H
 #define COMPONENT_H
 
+#include "BrickwareCoreDLL.h"
+
 #include "Settings.h"
 #include "Screen.h"
 
 class GameObject;
 
 #include "Input.h"
 
-class Component
+class BRICKWARE_CORE_API Component
 {
 public:
 	Component();

BrickwareCore/include/FrustumCollider.h

@@ -1,13 +1,15 @@
 #ifndef FRUSTRUMCOLLIDER_H
 #define FRUSTRUMCOLLIDER_H
 
+#include "BrickwareCoreDLL.h"
+
 #define USE_MATH_DEFINES
 
 #include <math.h>
 
 #include "Collider.h"
 
-class FrustumCollider : public Collider
+class BRICKWARE_CORE_API FrustumCollider : public Collider
 {
 public:
 	FrustumCollider(float zNear, float zFar, float FoV, float aspectRatio);

BrickwareCore/include/Game.h

@@ -1,6 +1,8 @@
 #ifndef GAME_H
 #define GAME_H
 
+#include "BrickwareCoreDLL.h"
+
 #define _USE_MATH_DEFINES
 
 #include <stdlib.h>
@@ -59,50 +61,50 @@ class Game
 	friend class MeshRenderer;
 
 public:
-	Game(int windowWidth, int windowHeight);
+	BRICKWARE_CORE_API Game(int windowWidth, int windowHeight);
 
-	int run();
+	BRICKWARE_CORE_API int run();
 
-	virtual bool init();
+	virtual BRICKWARE_CORE_API bool init();
 
-	virtual void updateScene() = 0;
-	virtual void renderScene() = 0;
+	virtual BRICKWARE_CORE_API void updateScene() = 0;
+	virtual BRICKWARE_CORE_API void renderScene() = 0;
 
 #ifdef D3D_SUPPORT
 	LRESULT MsgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);
 #endif
 
-	virtual ~Game();
+	virtual BRICKWARE_CORE_API ~Game();
 
 protected:
-	static vector<GameObject*> gameObjects;
+	static BRICKWARE_CORE_API vector<GameObject*> gameObjects;
 	bool running;
 
 private:
 	float interpolation;
 	int ticks;
 
-	void render();
-	void handleInput();
+	void BRICKWARE_CORE_API render();
+	void BRICKWARE_CORE_API handleInput();
 
 //OpenGL / GLFW3 vars and methods
 #ifdef GL_SUPPORT
-	static GLFWwindow* glWindow;
+	static BRICKWARE_CORE_API GLFWwindow* glWindow;
 
-	bool initGL();
-	void handleInputGLFW();
-	void startRenderGL();
-	void swapBuffersGL();
-	void endGL();
+	bool BRICKWARE_CORE_API initGL();
+	void BRICKWARE_CORE_API handleInputGLFW();
+	void BRICKWARE_CORE_API startRenderGL();
+	void BRICKWARE_CORE_API swapBuffersGL();
+	void BRICKWARE_CORE_API endGL();
 #endif
 
 //D3D vars and methods
 #ifdef D3D_SUPPORT
-	static ID3D11Device* device;
-	static ID3D11DeviceContext* deviceContext;
+	static BRICKWARE_CORE_API ID3D11Device* device;
+	static BRICKWARE_CORE_API ID3D11DeviceContext* deviceContext;
 
-	static HINSTANCE hAppInst;
-	static HWND hMainWind;
+	static BRICKWARE_CORE_API HINSTANCE hAppInst;
+	static BRICKWARE_CORE_API HWND hMainWind;
 
 	bool enable4xMsaa;
 	UINT msaa4xQuality;
@@ -116,14 +118,14 @@ class Game
 	D3D_FEATURE_LEVEL featureLevel;
 
 	//D3D Required methods
-	bool initD3DWindow();
-	void onResize();
-
-	bool initD3D();
-	void handleInputWindows();
-	void startRenderD3D();
-	void swapBuffersD3D();
-	void endD3D();
+	bool BRICKWARE_CORE_API initD3DWindow();
+	void BRICKWARE_CORE_API onResize();
+
+	bool BRICKWARE_CORE_API initD3D();
+	void BRICKWARE_CORE_API handleInputWindows();
+	void BRICKWARE_CORE_API startRenderD3D();
+	void BRICKWARE_CORE_API swapBuffersD3D();
+	void BRICKWARE_CORE_API endD3D();
 #endif
 
 };

BrickwareCore/include/GameObject.h

@@ -1,6 +1,8 @@
 #ifndef GAMEOBJECT_H
 #define GAMEOBJECT_H
 
+#include "BrickwareCoreDLL.h"
+
 #include <vector>
 #include <typeinfo>
 
@@ -17,15 +19,15 @@ class GameObject
 {
 public:
 
-    GameObject();
-	GameObject(Transform* transform);
+	BRICKWARE_CORE_API GameObject();
+	BRICKWARE_CORE_API GameObject(Transform* transform);
 
-	static vector<GameObject*> getGameObjects();
+	static BRICKWARE_CORE_API vector<GameObject*> getGameObjects();
 
 	//Accessors
-	Transform* getTransform();
+	BRICKWARE_CORE_API Transform* getTransform();
 
-	vector<Component*>& getComponents();
+	BRICKWARE_CORE_API vector<Component*>& getComponents();
 	//Return the first component of the given type
 	//If none are found; return null
 	template<class T> T* getComponent()
@@ -41,13 +43,13 @@ class GameObject
 	}
 
 	//Mutators 
-	void addComponent(Component* newComponent);
+	BRICKWARE_CORE_API void addComponent(Component* newComponent);
 
-	virtual void Start();
-	virtual void Update();
-	virtual void OnRender();
+	virtual BRICKWARE_CORE_API void Start();
+	virtual BRICKWARE_CORE_API void Update();
+	virtual BRICKWARE_CORE_API void OnRender();
 
-	~GameObject();
+	BRICKWARE_CORE_API ~GameObject();
 
 protected:
 	//Necessary Components