mirror of https://github.com/axmolengine/axmol.git
[Tizen] Fix compile error.
- Tizen SDK doesn't support override keyword yet. - add class keyword before friend keyword.
This commit is contained in:
parent
5af281c5ea
commit
980a053e50
CocosDenshion/proj.tizen
cocos2dx/platform/tizen
extensions
samples/Cpp/TestCpp/proj.tizen
|
@ -94,6 +94,7 @@
|
||||||
</option>
|
</option>
|
||||||
<option id="sbi.gnu.cpp.linker.option.frameworks_lflags.cpp.181465864" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.cpp" valueType="stringList">
|
<option id="sbi.gnu.cpp.linker.option.frameworks_lflags.cpp.181465864" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.cpp" valueType="stringList">
|
||||||
<listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/>
|
<listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/>
|
||||||
|
<listOptionValue builtIn="false" value="-Xlinker -rpath="/opt/usr/apps/null/lib""/>
|
||||||
</option>
|
</option>
|
||||||
</tool>
|
</tool>
|
||||||
<tool command="i386-linux-gnueabi-as.exe" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.165476943" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
|
<tool command="i386-linux-gnueabi-as.exe" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.165476943" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
|
||||||
|
@ -204,6 +205,7 @@
|
||||||
</option>
|
</option>
|
||||||
<option id="sbi.gnu.cpp.linker.option.frameworks_lflags.cpp.557112687" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.cpp" valueType="stringList">
|
<option id="sbi.gnu.cpp.linker.option.frameworks_lflags.cpp.557112687" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.cpp" valueType="stringList">
|
||||||
<listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/>
|
<listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/>
|
||||||
|
<listOptionValue builtIn="false" value="-Xlinker -rpath="/opt/usr/apps/null/lib""/>
|
||||||
</option>
|
</option>
|
||||||
</tool>
|
</tool>
|
||||||
<tool command="arm-linux-gnueabi-as.exe" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1047247012" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
|
<tool command="arm-linux-gnueabi-as.exe" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1047247012" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
|
||||||
|
|
|
@ -28,6 +28,7 @@ THE SOFTWARE.
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
#include <CCStdC.h>
|
||||||
|
|
||||||
#define CC_DLL
|
#define CC_DLL
|
||||||
|
|
||||||
|
|
|
@ -43,4 +43,6 @@ THE SOFTWARE.
|
||||||
|
|
||||||
#define nullptr __null
|
#define nullptr __null
|
||||||
|
|
||||||
|
#define override
|
||||||
|
|
||||||
#endif // __CC_STD_C_H__
|
#endif // __CC_STD_C_H__
|
||||||
|
|
|
@ -110,7 +110,7 @@ private:
|
||||||
void addSocket(const std::string& uri, SIOClientImpl* socket);
|
void addSocket(const std::string& uri, SIOClientImpl* socket);
|
||||||
void removeSocket(const std::string& uri);
|
void removeSocket(const std::string& uri);
|
||||||
|
|
||||||
friend SIOClientImpl;
|
friend class SIOClientImpl;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -114,6 +114,7 @@
|
||||||
</option>
|
</option>
|
||||||
<option id="sbi.gnu.cpp.linker.option.frameworks_lflags.cpp.181465864" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.cpp" valueType="stringList">
|
<option id="sbi.gnu.cpp.linker.option.frameworks_lflags.cpp.181465864" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.cpp" valueType="stringList">
|
||||||
<listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/>
|
<listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/>
|
||||||
|
<listOptionValue builtIn="false" value="-Xlinker -rpath="/opt/usr/apps/null/lib""/>
|
||||||
</option>
|
</option>
|
||||||
</tool>
|
</tool>
|
||||||
<tool command="i386-linux-gnueabi-as.exe" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GASErrorParser" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.165476943" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
|
<tool command="i386-linux-gnueabi-as.exe" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" errorParsers="org.eclipse.cdt.core.GASErrorParser" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.165476943" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
|
||||||
|
@ -249,6 +250,7 @@
|
||||||
</option>
|
</option>
|
||||||
<option id="sbi.gnu.cpp.linker.option.frameworks_lflags.cpp.557112687" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.cpp" valueType="stringList">
|
<option id="sbi.gnu.cpp.linker.option.frameworks_lflags.cpp.557112687" name="Tizen-Frameworks-Other-Lflags" superClass="sbi.gnu.cpp.linker.option.frameworks_lflags.cpp" valueType="stringList">
|
||||||
<listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/>
|
<listOptionValue builtIn="false" value="--sysroot="${SBI_SYSROOT}""/>
|
||||||
|
<listOptionValue builtIn="false" value="-Xlinker -rpath="/opt/usr/apps/null/lib""/>
|
||||||
</option>
|
</option>
|
||||||
</tool>
|
</tool>
|
||||||
<tool command="arm-linux-gnueabi-as.exe" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1047247012" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
|
<tool command="arm-linux-gnueabi-as.exe" id="org.tizen.nativeapp.tool.sbi.gnu.assembler.base.1047247012" name="Assembler" superClass="org.tizen.nativeapp.tool.sbi.gnu.assembler.base">
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
</option>
|
</option>
|
||||||
<option id="gnu.cpp.compiler.option.include.paths.900905101" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
|
<option id="gnu.cpp.compiler.option.include.paths.900905101" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/>
|
<listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/>
|
||||||
|
<listOptionValue builtIn="false" value=""${COCOS_ROOT}/samples/Cpp/TestCpp/Classes""/>
|
||||||
<listOptionValue builtIn="false" value=""${COCOS_SRC}""/>
|
<listOptionValue builtIn="false" value=""${COCOS_SRC}""/>
|
||||||
<listOptionValue builtIn="false" value=""${COCOS_SRC}/include""/>
|
<listOptionValue builtIn="false" value=""${COCOS_SRC}/include""/>
|
||||||
<listOptionValue builtIn="false" value=""${COCOS_SRC}/kazmath/include""/>
|
<listOptionValue builtIn="false" value=""${COCOS_SRC}/kazmath/include""/>
|
||||||
|
@ -524,6 +525,7 @@
|
||||||
</option>
|
</option>
|
||||||
<option id="gnu.cpp.compiler.option.include.paths.2133476194" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
|
<option id="gnu.cpp.compiler.option.include.paths.2133476194" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
|
||||||
<listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/>
|
<listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/inc}""/>
|
||||||
|
<listOptionValue builtIn="false" value=""${COCOS_ROOT}/samples/Cpp/TestCpp/Classes""/>
|
||||||
<listOptionValue builtIn="false" value=""${COCOS_SRC}""/>
|
<listOptionValue builtIn="false" value=""${COCOS_SRC}""/>
|
||||||
<listOptionValue builtIn="false" value=""${COCOS_SRC}/include""/>
|
<listOptionValue builtIn="false" value=""${COCOS_SRC}/include""/>
|
||||||
<listOptionValue builtIn="false" value=""${COCOS_SRC}/kazmath/include""/>
|
<listOptionValue builtIn="false" value=""${COCOS_SRC}/kazmath/include""/>
|
||||||
|
|
Loading…
Reference in New Issue