Merge branch 'master' of github.com:bitshifter/Polycode

CMakeLists.txt

@@ -21,6 +21,7 @@ IF(WIN32)
     SET(CMAKE_PREFIX_PATH ${PolyCode_SOURCE_DIR}/Release/Win/Framework/Dependencies)
 ENDIF(WIN32)
 
+FIND_PACKAGE(PhysFS REQUIRED)
 FIND_PACKAGE(OpenGL REQUIRED)
 FIND_PACKAGE(OpenAL REQUIRED)
 FIND_PACKAGE(Freetype REQUIRED)

Core/Build/Linux/PolycodeView.cpp

@@ -3,12 +3,16 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-PolycodeView::PolycodeView(const char *title) : PolycodeViewBase() {
-	windowTitle = title;
-	windowData = &windowTitle;
-}
+namespace Polycode {
+
+    PolycodeView::PolycodeView(const char *title) : PolycodeViewBase() {
+        windowTitle = title;
+        windowData = &windowTitle;
+    }
+
+    PolycodeView::~PolycodeView() {
 
-PolycodeView::~PolycodeView() {
+    }
 
 }
 

Core/Build/Linux/PolycodeView.h

@@ -3,10 +3,14 @@
 #include <Polycode.h>
 #include "PolySDLCore.h"
 
-class PolycodeView : public PolycodeViewBase {
-	public:
-		PolycodeView(const char *title);
-		~PolycodeView();
+namespace Polycode {
 
-		String windowTitle;
-};
+    class PolycodeView : public PolycodeViewBase {
+        public:
+            PolycodeView(const char *title);
+            ~PolycodeView();
+
+            String windowTitle;
+    };
+
+}

Tools/Contents/CMakeLists.txt

@@ -0,0 +1,2 @@
+#ADD_SUBDIRECTORY(polybuild)
+ADD_SUBDIRECTORY(polyimport)

Tools/Contents/polybuild/CMakeLists.txt

@@ -0,0 +1,2 @@
+INCLUDE_DIRECTORIES(${PolyCode_SOURCE_DIR}/Tools/Dependencies/unzip11 Include)
+ADD_EXECUTABLE(polybuild Source/polybuild.cpp Include/polybuild.h)

Tools/Contents/polyimport/CMakeLists.txt

@@ -0,0 +1,16 @@
+LINK_LIBRARIES(
+    PolyCoreStatic
+#    ${SDL_LIBRARY}
+#    ${SDLMAIN_LIBRARY}
+#    ${OPENGL_LIBRARIES}
+#    ${OPENAL_LIBRARY}
+#    ${PNG_LIBRARIES}
+#    ${FREETYPE_LIBRARIES}
+    ${PHYSFS_LIBRARY}
+#    ${VORBISFILE_LIBRARY}
+    assimp
+)
+
+
+INCLUDE_DIRECTORIES(${PolyCode_SOURCE_DIR}/Core/Contents/Include Include /usr/include/assimp)
+ADD_EXECUTABLE(polyimport Source/polyimport.cpp Include/polyimport.h)