Просмотр исходного кода

Documentation generation fixed for cldoc

Ivan Safrin 9 лет назад
Родитель
Сommit
fd9a8a99ba

+ 20 - 2
docs/Makefile

@@ -1,7 +1,25 @@
 DIR=../include/polycode/core/
-FILES=$(DIR)PolyEntity.h $(DIR)PolySceneMesh.h
+
+HEADERS = $(wildcard ../include/polycode/core/*.h)
+SOURCES = $(wildcard ../src/core/*.cpp)
+
+HEADERS := $(filter-out ../include/polycode/core/PolyRPICore.h, $(HEADERS))
+HEADERS := $(filter-out ../include/polycode/core/PolySDLCore.h, $(HEADERS))
+HEADERS := $(filter-out ../include/polycode/core/PolyUWPCore.h, $(HEADERS))
+HEADERS := $(filter-out ../include/polycode/core/PolyWinCore.h, $(HEADERS))
+HEADERS := $(filter-out ../include/polycode/core/PolyCocoaCore.h, $(HEADERS))
+HEADERS := $(filter-out ../include/polycode/core/PolyIOSCore.h, $(HEADERS))
+HEADERS := $(filter-out ../include/polycode/core/PolyXAudio2AudioInterface.h, $(HEADERS))
+
+SOURCES := $(filter-out ../src/core/PolyRPICore.cpp, $(SOURCES))
+SOURCES := $(filter-out ../src/core/PolySDLCore.cpp, $(SOURCES))
+SOURCES := $(filter-out ../src/core/PolyUWPCore.cpp, $(SOURCES))
+SOURCES := $(filter-out ../src/core/PolyWinCore.cpp, $(SOURCES))
+SOURCES := $(filter-out ../src/core/tinystr.cpp, $(SOURCES))
+SOURCES := $(filter-out ../src/core/PolyXAudio2AudioInterface.cpp, $(SOURCES))
+
 
 cldoc-mac:
 	mkdir -p cldoc
-	cldoc generate -I../include/ -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk -- --static --output=cldoc --language=c++ $(FILES)
+	cldoc generate -DCLDOC -I../include/ -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk --  --static --output=cldoc --language=c++ $(SOURCES) $(HEADERS)
 

+ 3 - 1
include/polycode/core/PolyGlobals.h

@@ -75,7 +75,9 @@ typedef unsigned int PolyRendererIndexType;
 #if defined(_WINDOWS) || defined(WINAPI_FAMILY)  || defined(WIN32)
 	#define PLATFORM PLATFORM_WINDOWS
 #elif __APPLE__ && __MACH__
-    #include <TargetConditionals.h>
+    #ifndef CLDOC
+	    #include <TargetConditionals.h>
+    #endif
     #if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
         #define PLATFORM PLATFORM_IOS
         #define STRICT_OPENGLES2 1

+ 3 - 1
include/polycode/core/PolyServer.h

@@ -25,13 +25,15 @@ THE SOFTWARE.
 #include "polycode/core/PolyGlobals.h"
 #include "polycode/core/PolyPeer.h"
 #include "polycode/core/PolyEvent.h"
-#include "polycode/core/PolyServerWorld.h"
 #include <vector>
 
 using std::vector;
 
 namespace Polycode {
 
+	class ServerClient;
+	class ServerWorld;
+
 	class _PolyExport ServerClientEvent : public Event {
 	public:
 		ServerClientEvent() {}

+ 1 - 0
src/core/PolyServer.cpp

@@ -24,6 +24,7 @@ THE SOFTWARE.
 #include "polycode/core/PolyServer.h"
 #include "polycode/core/PolyTimer.h"
 #include "polycode/core/PolyLogger.h"
+#include "polycode/core/PolyServerWorld.h"
 
 using namespace Polycode;
 using std::vector;