Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Tizen] Fix compile error. 

- Tizen SDK doesn't support override keyword yet.
- add class keyword before friend keyword.
This commit is contained in:
Lee, Jae-Hong 2013-07-19 15:16:05 +09:00
parent 5af281c5ea
commit 980a053e50
6 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CocosDenshion/proj.tizen/.cproject
View File

@ -94,6 +94,7 @@
</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">
<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
<listOptionValue builtIn="false" value="-Xlinker -rpath=&quot;/opt/usr/apps/null/lib&quot;"/>
</option>
</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">
@ -204,6 +205,7 @@
</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">
<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
<listOptionValue builtIn="false" value="-Xlinker -rpath=&quot;/opt/usr/apps/null/lib&quot;"/>
</option>
</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">

1
cocos2dx/platform/tizen/CCPlatformDefine.h
View File

@ -28,6 +28,7 @@ THE SOFTWARE.
#include <string.h>
#include <assert.h>
#include <CCStdC.h>
#define CC_DLL

2
cocos2dx/platform/tizen/CCStdC.h
View File

@ -43,4 +43,6 @@ THE SOFTWARE.
#define nullptr __null
#define override
#endif // __CC_STD_C_H__

2
extensions/network/SocketIO.h
View File

@ -110,7 +110,7 @@ private:
void addSocket(const std::string& uri, SIOClientImpl* socket);
void removeSocket(const std::string& uri);
friend SIOClientImpl;
friend class SIOClientImpl;
};

2
extensions/proj.tizen/.cproject
View File

@ -114,6 +114,7 @@
</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">
<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
<listOptionValue builtIn="false" value="-Xlinker -rpath=&quot;/opt/usr/apps/null/lib&quot;"/>
</option>
</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">
@ -249,6 +250,7 @@
</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">
<listOptionValue builtIn="false" value="--sysroot=&quot;${SBI_SYSROOT}&quot;"/>
<listOptionValue builtIn="false" value="-Xlinker -rpath=&quot;/opt/usr/apps/null/lib&quot;"/>
</option>
</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">

2
samples/Cpp/TestCpp/proj.tizen/.cproject
View File

@ -44,6 +44,7 @@
</option>
<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="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_ROOT}/samples/Cpp/TestCpp/Classes&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_SRC}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_SRC}/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_SRC}/kazmath/include&quot;"/>
@ -524,6 +525,7 @@
</option>
<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="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_ROOT}/samples/Cpp/TestCpp/Classes&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_SRC}&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_SRC}/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;${COCOS_SRC}/kazmath/include&quot;"/>