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

Merge pull request #761 from peoronoob/linux 

fixed #1051:Fixed and improved building on Linux
This commit is contained in:
minggo 2012-03-12 19:44:51 -07:00
parent cc7542a86b 4f2f403827
commit 287e4c2845
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cocos2dx/platform/CCApplication_platform.h
View File

@ -38,7 +38,7 @@ THE SOFTWARE.
#elif (CC_TARGET_PLATFORM == CC_PLATFORM_MARMALADE) #elif (CC_TARGET_PLATFORM == CC_PLATFORM_MARMALADE)
#include "marmalade/CCApplication_marmalade.h" #include "marmalade/CCApplication_marmalade.h"
#elif (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX) #elif (CC_TARGET_PLATFORM == CC_PLATFORM_LINUX)
#include "linux/CCAplication_linux.h" #include "linux/CCApplication_linux.h"
#elif (CC_TARGET_PLATFORM == CC_PLATFORM_BADA) #elif (CC_TARGET_PLATFORM == CC_PLATFORM_BADA)
#include "bada/CCApplication_bada.h" #include "bada/CCApplication_bada.h"
#elif (CC_TARGET_PLATFORM == CC_PLATFORM_QNX) #elif (CC_TARGET_PLATFORM == CC_PLATFORM_QNX)

2
cocos2dx/platform/linux/CCAplication_linux.cpp → cocos2dx/platform/linux/CCApplication_linux.cpp
View File

@ -1,5 +1,5 @@
/* /*
* CCAplication_linux.cpp * CCApplication_linux.cpp
* *
* Created on: Aug 8, 2011 * Created on: Aug 8, 2011
* Author: laschweinski * Author: laschweinski

8
cocos2dx/platform/linux/CCAplication_linux.h → cocos2dx/platform/linux/CCApplication_linux.h
View File

@ -1,12 +1,12 @@
/* /*
* CCAplication_linux.h * CCApplication_linux.h
* *
* Created on: Aug 8, 2011 * Created on: Aug 8, 2011
* Author: laschweinski * Author: laschweinski
*/ */
#ifndef CCAPLICATION_LINUX_H_ #ifndef CCAPPLICATION_LINUX_H_
#define CCAPLICATION_LINUX_H_ #define CCAPPLICATION_LINUX_H_
#include "CCCommon.h" #include "CCCommon.h"
@ -96,4 +96,4 @@ protected:
NS_CC_END; NS_CC_END;
#endif /* CCAPLICATION_LINUX_H_ */ #endif /* CCAPPLICATION_LINUX_H_ */

2
cocos2dx/platform/linux/CCEGLView_linux.cpp
View File

@ -156,7 +156,7 @@ void mousePosEventHandle(int iPosX,int iPosY) {
if (iButtonState == GLFW_PRESS) { if (iButtonState == GLFW_PRESS) {
if (iPosX!=(int)s_pMainWindow->m_mousePoint.x||iPosY!=(int)s_pMainWindow->m_mousePoint.y) { if (iPosX!=(int)s_pMainWindow->m_mousePoint.x||iPosY!=(int)s_pMainWindow->m_mousePoint.y) {
//it movies //it movies
s_pMainWindow->m_pTouch->SetTouchInfo(0, (float)(iPosX- s_pMainWindow->m_rcViewPort.origin.x) / s_pMainWindow->m_fScreenScaleFactor, s_pMainWindow->m_pTouch->SetTouchInfo((float)(iPosX- s_pMainWindow->m_rcViewPort.origin.x) / s_pMainWindow->m_fScreenScaleFactor,
(float)(iPosY - s_pMainWindow->m_rcViewPort.origin.y) / s_pMainWindow->m_fScreenScaleFactor); (float)(iPosY - s_pMainWindow->m_rcViewPort.origin.y) / s_pMainWindow->m_fScreenScaleFactor);
s_pMainWindow->m_pDelegate->touchesMoved(s_pMainWindow->m_pSet, NULL); s_pMainWindow->m_pDelegate->touchesMoved(s_pMainWindow->m_pSet, NULL);
//update new mouse pos //update new mouse pos

4
cocos2dx/proj.linux/Makefile
View File

@ -66,8 +66,8 @@ OBJECTS = ../actions/CCAction.o \
../platform/CCStdC.o \ ../platform/CCStdC.o \
../platform/CCThread.o \ ../platform/CCThread.o \
../platform/platform.o \ ../platform/platform.o \
../platform/Linux/CCAplication_linux.o \ ../platform/linux/CCApplication_linux.o \
../platform/Linux/CCEGLView_linux.o \ ../platform/linux/CCEGLView_linux.o \
../script_support/CCScriptSupport.o \ ../script_support/CCScriptSupport.o \
../sprite_nodes/CCAnimation.o \ ../sprite_nodes/CCAnimation.o \
../sprite_nodes/CCAnimationCache.o \ ../sprite_nodes/CCAnimationCache.o \