Skip to content

Commit d231f27

Browse files
author
natural-law
committed
[wophone]fixed cocos2d#386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone.
1 parent 6f164c1 commit d231f27

File tree

14 files changed

+97
-74
lines changed

14 files changed

+97
-74
lines changed

‎Box2D/proj.wophone/Box2D.TMK3

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ INCLUDE_TMK3=$(TO_PROJECT_ROOT)/MakeInclude/TG3_APP_Arm.TMK3 ;TOPS
2929
;PRE_DEFINE=USE_MTAPI=1 ;ʹ�� MTAPI �⣬��ʱ���ɵ� Makefile ���Զ������йص�LIB
3030

3131
;C��C++Ԥ����꣬����ʹ�ö��DEFINES����Ҳ����ʹ��DEFINES1��DEFINES2�ȷ�ʽ��MakeFile�����ݳ���˳��(�������ִ�С)����
32-
DEFINES=-DCCX_UNDER_WOPHONE ;��������Ӧ�õ��Զ���ꡣע�⣺ITOPS�Լ������趨����Զ��������ʴ������������Ӧ���Լ����еĶ��弴��
32+
DEFINES=-DCC_UNDER_WOPHONE ;��������Ӧ�õ��Զ���ꡣע�⣺ITOPS�Լ������趨����Զ��������ʴ������������Ӧ���Լ����еĶ��弴��
3333
;DEFINES=-D__TG3_PURE_DLL__ ;���ɵ��Ǵ���̬�⣨��˼�ǣ�����TOPSӦ�ã���������TCOM�����
3434
;DEFINES=-D__TCOM_SUPPORT__ ;���ɵ���TCOM�����ע�⣺TOPSӦ��Ҳ����ͬʱ��TCOM�����
3535

‎Box2D/proj.wophone/Makefile.ARM

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ OUTPUT_FILENAME = libBox2DStatic.a
1212
include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_Base_StaticLib.ARM
1313
include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_TOPS_Def.ARM
1414

15-
DEFINES += -DCCX_UNDER_WOPHONE
15+
DEFINES += -DCC_UNDER_WOPHONE
1616
INCLUDE_PATH += -I../ -I../../
1717

1818
CXX_FLAGS += -fvisibility=default

‎CocosDenshion/proj.wophone/Makefile.ARM

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ OUTPUT_FILENAME = libCocosDenshionStatic.a
1212
include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_Base_StaticLib.ARM
1313
include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_TOPS_Def.ARM
1414

15-
DEFINES += -DCCX_UNDER_WOPHONE \
15+
DEFINES += -DCC_UNDER_WOPHONE \
1616
-D__TG3_PURE_DLL__ \
1717
-DUSE_FILE32API
1818
INCLUDE_PATH += -I../ \

‎CocosDenshion/proj.wophone/SimpleAudioEngine_Arm_wophone.TMK3

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ INCLUDE_TMK3=$(TO_PROJECT_ROOT)/MakeInclude/TG3_LIB_Arm.TMK3 ;TOPS
2929
;PRE_DEFINE=USE_MTAPI=1 ;ʹ�� MTAPI �⣬��ʱ���ɵ� Makefile ���Զ������йص�LIB
3030

3131
;C��C++Ԥ����꣬����ʹ�ö��DEFINES����Ҳ����ʹ��DEFINES1��DEFINES2�ȷ�ʽ��MakeFile�����ݳ���˳��(�������ִ�С)����
32-
DEFINES=-DCCX_UNDER_WOPHONE ;��wophone�����µ�makefile
32+
DEFINES=-DCC_UNDER_WOPHONE ;��wophone�����µ�makefile
3333
DEFINES=-D__TG3_PURE_DLL__ ;���ɵ��Ǵ���̬�⣨��˼�ǣ�����TOPSӦ�ã���������TCOM�����
3434
DEFINES=-DUSE_FILE32API
3535

‎HelloWorld/wophone/HelloWorld.TMK3

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,15 @@ INCLUDE_TMK3=$(TO_PROJECT_ROOT)/MakeInclude/TG3_APP_Arm.TMK3 ;TOPS
2929
;PRE_DEFINE=USE_MTAPI=1 ;ʹ�� MTAPI �⣬��ʱ���ɵ� Makefile ���Զ������йص�LIB
3030

3131
;C��C++Ԥ����꣬����ʹ�ö��DEFINES����Ҳ����ʹ��DEFINES1��DEFINES2�ȷ�ʽ��MakeFile�����ݳ���˳��(�������ִ�С)����
32-
DEFINES=-DCCX_UNDER_WOPHONE ;��������Ӧ�õ��Զ���ꡣע�⣺ITOPS�Լ������趨����Զ��������ʴ������������Ӧ���Լ����еĶ��弴��
32+
DEFINES=-DCC_UNDER_WOPHONE ;��������Ӧ�õ��Զ���ꡣע�⣺ITOPS�Լ������趨����Զ��������ʴ������������Ӧ���Լ����еĶ��弴��
3333
;DEFINES=-D__TG3_PURE_DLL__ ;���ɵ��Ǵ���̬�⣨��˼�ǣ�����TOPSӦ�ã���������TCOM�����
3434
;DEFINES=-D__TCOM_SUPPORT__ ;���ɵ���TCOM�����ע�⣺TOPSӦ��Ҳ����ͬʱ��TCOM�����
3535

3636
;����·��������ʹ�ö��INCLUDE_PATH����Ҳ����ʹ��INCLUDE_PATH1��INCLUDE_PATH2�ȷ�ʽ��MakeFile�����ݳ���˳��(�������ִ�С)����
37-
INCLUDE_PATH=-I./Res -I../ -I../wophone -I../cocos2dx -I../cocos2dx/include -I../platform_support/include ;Ӧ�ö���İ���·����ע�⣺ITOPS�Լ�������·�������Զ��������ʴ������������Ӧ���Լ����е�·������
37+
INCLUDE_PATH=-I./Res -I../ -I../wophone -I../cocos2dx -I../cocos2dx/include -I../cocos2dx/platform ;Ӧ�ö���İ���·����ע�⣺ITOPS�Լ�������·�������Զ��������ʴ������������Ӧ���Լ����е�·������
3838

3939
;���ӵĿ��ļ�������ʹ�ö��LIBS����Ҳ����ʹ��LIBS1��LIBS2�ȷ�ʽ��MakeFile�����ݳ���˳��(�������ִ�С)����
40-
LIBS=-lCocos2dStatic -lPlatformSupportStatic -lTG3_GLESv1_CM -lTG3_EGL -lz -lxml2 -lpng14 -lImageToolKit -ljpeg ;Ӧ�ö�������ӿ⡣ע�⣺ITOPS�Լ���������Զ����������ҿ����·��Ҳ�Ѿ��������ʴ������������Ӧ���Լ����еĿ�����ּ���
40+
LIBS=-lCocos2dStatic -lTG3_GLESv1_CM -lTG3_EGL -lz -lxml2 -lpng14 -lImageToolKit -ljpeg ;Ӧ�ö�������ӿ⡣ע�⣺ITOPS�Լ���������Զ����������ҿ����·��Ҳ�Ѿ��������ʴ������������Ӧ���Լ����еĿ�����ּ���
4141

4242
;ǿ�ư����ļ������֣�����ʹ��ͨ�����һ��Ҫʹ����Ի��߾���·��
4343
;����Ҫ��ʹ�����·��������ļ�֮��ʹ�á�|���ָ�

‎HelloWorld/wophone/Makefile.ARM

+5-5
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ OUTPUT_FILENAME = libHelloWorld.so
1212
include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_Base_DynamicLib.ARM
1313
include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_TOPS_Def.ARM
1414

15-
DEFINES += -DCCX_UNDER_WOPHONE
15+
DEFINES += -DCC_UNDER_WOPHONE
1616
INCLUDE_PATH += -I./Res \
17-
-I../ \
18-
-I../wophone \
17+
-I../ \
18+
-I../wophone \
1919
-I../../cocos2dx \
2020
-I../../cocos2dx/include \
21-
-I../../platform_support/include
22-
LIBS += -lCocos2dStatic -lPlatformSupportStatic -lTG3_GLESv1_CM -lTG3_EGL -lz -lxml2 -lpng14 -lImageToolKit -ljpeg
21+
-I../../cocos2dx/platform
22+
LIBS += -lCocos2dStatic -lTG3_GLESv1_CM -lTG3_EGL -lz -lxml2 -lpng14 -lImageToolKit -ljpeg
2323

2424
OBJECTS_DIR = ./Debug-ARM
2525
DESTDIR = $(TO_PROJECT_ROOT)/$(BIN_OUTPUT_DIR)

‎build-wophone.sh

-5
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ make -f Makefile.ARM clean
88
make -f Makefile.ARM all
99
popd
1010

11-
pushd ./platform_support/proj.wophone
12-
make -f Makefile.ARM clean
13-
make -f Makefile.ARM all
14-
popd
15-
1611
pushd ./cocos2dx/proj.wophone
1712
make -f Makefile.ARM clean
1813
make -f Makefile.ARM all

‎chipmunk/proj.wophone/Makefile.ARM

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ OUTPUT_FILENAME = libChipmunkStatic.a
1212
include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_Base_StaticLib.ARM
1313
include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_TOPS_Def.ARM
1414

15-
DEFINES += -DCCX_UNDER_WOPHONE
15+
DEFINES += -DCC_UNDER_WOPHONE
1616
INCLUDE_PATH += -I../ \
1717
-I../../cocos2dx -I../../cocos2dx/include \
1818
-I../include -I../include/chipmunk -I../include/chipmunk/contains \

‎chipmunk/proj.wophone/chipmunk.TMK3

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ INCLUDE_TMK3=$(TO_PROJECT_ROOT)/MakeInclude/TG3_APP_Arm.TMK3 ;TOPS
2929
;PRE_DEFINE=USE_MTAPI=1 ;ʹ�� MTAPI �⣬��ʱ���ɵ� Makefile ���Զ������йص�LIB
3030

3131
;C��C++Ԥ����꣬����ʹ�ö��DEFINES����Ҳ����ʹ��DEFINES1��DEFINES2�ȷ�ʽ��MakeFile�����ݳ���˳��(�������ִ�С)����
32-
DEFINES=-DCCX_UNDER_WOPHONE ;��������Ӧ�õ��Զ���ꡣע�⣺ITOPS�Լ������趨����Զ��������ʴ������������Ӧ���Լ����еĶ��弴��
32+
DEFINES=-DCC_UNDER_WOPHONE ;��������Ӧ�õ��Զ���ꡣע�⣺ITOPS�Լ������趨����Զ��������ʴ������������Ӧ���Լ����еĶ��弴��
3333
;DEFINES=-D__TG3_PURE_DLL__ ;���ɵ��Ǵ���̬�⣨��˼�ǣ�����TOPSӦ�ã���������TCOM�����
3434
;DEFINES=-D__TCOM_SUPPORT__ ;���ɵ���TCOM�����ע�⣺TOPSӦ��Ҳ����ͬʱ��TCOM�����
3535

‎cocos2dx/platform/CCStdC.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,12 @@ THE SOFTWARE.
5454

5555
#endif // CC_TARGET_PLATFORM == CC_PLATFORM_WOPHONE && defined(_TRANZDA_VM_)
5656

57+
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WOPHONE)
58+
59+
#include "TG3.h"
60+
61+
#endif // CC_PLATFORM_WOPHONE
62+
5763
#include <math.h>
5864

5965
#include <string.h>
@@ -81,12 +87,6 @@ int CC_DLL gettimeofday(struct timeval *, struct timezone *);
8187

8288
#endif // CC_PLATFORM_WIN32
8389

84-
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WOPHONE)
85-
86-
#include "TG3.h"
87-
88-
#endif // CC_PLATFORM_WOPHONE
89-
9090
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID)
9191

9292
#include <sys/time.h>

‎cocos2dx/proj.wophone/Makefile.ARM

+65-41
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ OUTPUT_FILENAME = libCocos2dStatic.a
1212
include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_Base_StaticLib.ARM
1313
include $(TO_PROJECT_ROOT)/MakeInclude/Makefile_TOPS_Def.ARM
1414

15-
DEFINES += -DCCX_UNDER_WOPHONE \
15+
DEFINES += -DCC_UNDER_WOPHONE \
1616
-D__TG3_PURE_DLL__ \
1717
-DUSE_FILE32API
1818
INCLUDE_PATH += -I../ \
19-
-I../../platform_support/include \
19+
-I../platform \
2020
-I../include -I$(TO_PROJECT_ROOT)/Include/ThirdParty/libxml2 \
2121
-I$(TO_PROJECT_ROOT)/Include/ThirdParty/iconv \
2222
-I$(TO_PROJECT_ROOT)/Include/ThirdParty/libpng \
@@ -49,13 +49,13 @@ OBJECTS = \
4949
$(OBJECTS_DIR)/CCActionProgressTimer.o \
5050
$(OBJECTS_DIR)/CCActionTiledGrid.o \
5151
$(OBJECTS_DIR)/CCAtlasNode.o \
52-
$(OBJECTS_DIR)/CGAffineTransform.o \
53-
$(OBJECTS_DIR)/CGGeometry.o \
54-
$(OBJECTS_DIR)/NSAutoreleasePool.o \
55-
$(OBJECTS_DIR)/NSData.o \
56-
$(OBJECTS_DIR)/NSObject.o \
57-
$(OBJECTS_DIR)/NSSet.o \
58-
$(OBJECTS_DIR)/NSZone.o \
52+
$(OBJECTS_DIR)/CCAffineTransform.o \
53+
$(OBJECTS_DIR)/CCAutoreleasePool.o \
54+
$(OBJECTS_DIR)/CCData.o \
55+
$(OBJECTS_DIR)/CCGeometry.o \
56+
$(OBJECTS_DIR)/CCObject.o \
57+
$(OBJECTS_DIR)/CCSet.o \
58+
$(OBJECTS_DIR)/CCZone.o \
5959
$(OBJECTS_DIR)/CCGrabber.o \
6060
$(OBJECTS_DIR)/CCEventDispatcher.o \
6161
$(OBJECTS_DIR)/CCKeyboardEventDelegate.o \
@@ -76,19 +76,25 @@ OBJECTS = \
7676
$(OBJECTS_DIR)/CCParticleExamples.o \
7777
$(OBJECTS_DIR)/CCParticleSystem.o \
7878
$(OBJECTS_DIR)/CCParticleSystemQuad.o \
79+
$(OBJECTS_DIR)/CCCommon.o \
7980
$(OBJECTS_DIR)/CCDirector_mobile.o \
81+
$(OBJECTS_DIR)/CCGL.o \
8082
$(OBJECTS_DIR)/CCGrid_mobile.o \
83+
$(OBJECTS_DIR)/CCImage.o \
8184
$(OBJECTS_DIR)/CCLayer_mobile.o \
8285
$(OBJECTS_DIR)/CCMenu_mobile.o \
8386
$(OBJECTS_DIR)/CCNode_mobile.o \
8487
$(OBJECTS_DIR)/CCParticleSystemPoint_mobile.o \
88+
$(OBJECTS_DIR)/CCStdC.o \
89+
$(OBJECTS_DIR)/CCThread.o \
8590
$(OBJECTS_DIR)/CCTransition_mobile.o \
8691
$(OBJECTS_DIR)/platform.o \
92+
$(OBJECTS_DIR)/CCLock.o \
93+
$(OBJECTS_DIR)/CCAccelerometer_wophone.o \
94+
$(OBJECTS_DIR)/CCApplication_wophone.o \
95+
$(OBJECTS_DIR)/CCEGLView_wophone.o \
96+
$(OBJECTS_DIR)/CCFileUtils_wophone.o \
8797
$(OBJECTS_DIR)/CCNS_wophone.o \
88-
$(OBJECTS_DIR)/ccxApplication_wophone.o \
89-
$(OBJECTS_DIR)/CCXEGLView_wophone.o \
90-
$(OBJECTS_DIR)/CCXFileUtils_wophone.o \
91-
$(OBJECTS_DIR)/CCXUIAccelerometer_wophone.o \
9298
$(OBJECTS_DIR)/CCAnimation.o \
9399
$(OBJECTS_DIR)/CCAnimationCache.o \
94100
$(OBJECTS_DIR)/CCSprite.o \
@@ -97,9 +103,9 @@ OBJECTS = \
97103
$(OBJECTS_DIR)/CCSpriteFrameCache.o \
98104
$(OBJECTS_DIR)/CCSpriteSheet.o \
99105
$(OBJECTS_DIR)/base64.o \
106+
$(OBJECTS_DIR)/CCPointExtension.o \
100107
$(OBJECTS_DIR)/CCProfiling.o \
101108
$(OBJECTS_DIR)/ccUtils.o \
102-
$(OBJECTS_DIR)/CGPointExtension.o \
103109
$(OBJECTS_DIR)/TransformUtils.o \
104110
$(OBJECTS_DIR)/FileUtils.o \
105111
$(OBJECTS_DIR)/TGAlib.o \
@@ -186,26 +192,26 @@ $(OBJECTS_DIR)/CCActionTiledGrid.o : ../actions/CCActionTiledGrid.cpp
186192
$(OBJECTS_DIR)/CCAtlasNode.o : ../base_nodes/CCAtlasNode.cpp
187193
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCAtlasNode.o ../base_nodes/CCAtlasNode.cpp
188194

189-
$(OBJECTS_DIR)/CGAffineTransform.o : ../cocoa/CGAffineTransform.cpp
190-
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CGAffineTransform.o ../cocoa/CGAffineTransform.cpp
195+
$(OBJECTS_DIR)/CCAffineTransform.o : ../cocoa/CCAffineTransform.cpp
196+
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCAffineTransform.o ../cocoa/CCAffineTransform.cpp
191197

192-
$(OBJECTS_DIR)/CGGeometry.o : ../cocoa/CGGeometry.cpp
193-
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CGGeometry.o ../cocoa/CGGeometry.cpp
198+
$(OBJECTS_DIR)/CCAutoreleasePool.o : ../cocoa/CCAutoreleasePool.cpp
199+
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCAutoreleasePool.o ../cocoa/CCAutoreleasePool.cpp
194200

195-
$(OBJECTS_DIR)/NSAutoreleasePool.o : ../cocoa/NSAutoreleasePool.cpp
196-
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/NSAutoreleasePool.o ../cocoa/NSAutoreleasePool.cpp
201+
$(OBJECTS_DIR)/CCData.o : ../cocoa/CCData.cpp
202+
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCData.o ../cocoa/CCData.cpp
197203

198-
$(OBJECTS_DIR)/NSData.o : ../cocoa/NSData.cpp
199-
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/NSData.o ../cocoa/NSData.cpp
204+
$(OBJECTS_DIR)/CCGeometry.o : ../cocoa/CCGeometry.cpp
205+
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCGeometry.o ../cocoa/CCGeometry.cpp
200206

201-
$(OBJECTS_DIR)/NSObject.o : ../cocoa/NSObject.cpp
202-
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/NSObject.o ../cocoa/NSObject.cpp
207+
$(OBJECTS_DIR)/CCObject.o : ../cocoa/CCObject.cpp
208+
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCObject.o ../cocoa/CCObject.cpp
203209

204-
$(OBJECTS_DIR)/NSSet.o : ../cocoa/NSSet.cpp
205-
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/NSSet.o ../cocoa/NSSet.cpp
210+
$(OBJECTS_DIR)/CCSet.o : ../cocoa/CCSet.cpp
211+
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCSet.o ../cocoa/CCSet.cpp
206212

207-
$(OBJECTS_DIR)/NSZone.o : ../cocoa/NSZone.cpp
208-
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/NSZone.o ../cocoa/NSZone.cpp
213+
$(OBJECTS_DIR)/CCZone.o : ../cocoa/CCZone.cpp
214+
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCZone.o ../cocoa/CCZone.cpp
209215

210216
$(OBJECTS_DIR)/CCGrabber.o : ../effects/CCGrabber.cpp
211217
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCGrabber.o ../effects/CCGrabber.cpp
@@ -267,12 +273,21 @@ $(OBJECTS_DIR)/CCParticleSystem.o : ../particle_nodes/CCParticleSystem.cpp
267273
$(OBJECTS_DIR)/CCParticleSystemQuad.o : ../particle_nodes/CCParticleSystemQuad.cpp
268274
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCParticleSystemQuad.o ../particle_nodes/CCParticleSystemQuad.cpp
269275

276+
$(OBJECTS_DIR)/CCCommon.o : ../platform/CCCommon.cpp
277+
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCCommon.o ../platform/CCCommon.cpp
278+
270279
$(OBJECTS_DIR)/CCDirector_mobile.o : ../platform/CCDirector_mobile.cpp
271280
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCDirector_mobile.o ../platform/CCDirector_mobile.cpp
272281

282+
$(OBJECTS_DIR)/CCGL.o : ../platform/CCGL.cpp
283+
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCGL.o ../platform/CCGL.cpp
284+
273285
$(OBJECTS_DIR)/CCGrid_mobile.o : ../platform/CCGrid_mobile.cpp
274286
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCGrid_mobile.o ../platform/CCGrid_mobile.cpp
275287

288+
$(OBJECTS_DIR)/CCImage.o : ../platform/CCImage.cpp
289+
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCImage.o ../platform/CCImage.cpp
290+
276291
$(OBJECTS_DIR)/CCLayer_mobile.o : ../platform/CCLayer_mobile.cpp
277292
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCLayer_mobile.o ../platform/CCLayer_mobile.cpp
278293

@@ -285,26 +300,35 @@ $(OBJECTS_DIR)/CCNode_mobile.o : ../platform/CCNode_mobile.cpp
285300
$(OBJECTS_DIR)/CCParticleSystemPoint_mobile.o : ../platform/CCParticleSystemPoint_mobile.cpp
286301
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCParticleSystemPoint_mobile.o ../platform/CCParticleSystemPoint_mobile.cpp
287302

303+
$(OBJECTS_DIR)/CCStdC.o : ../platform/CCStdC.cpp
304+
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCStdC.o ../platform/CCStdC.cpp
305+
306+
$(OBJECTS_DIR)/CCThread.o : ../platform/CCThread.cpp
307+
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCThread.o ../platform/CCThread.cpp
308+
288309
$(OBJECTS_DIR)/CCTransition_mobile.o : ../platform/CCTransition_mobile.cpp
289310
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCTransition_mobile.o ../platform/CCTransition_mobile.cpp
290311

291312
$(OBJECTS_DIR)/platform.o : ../platform/platform.cpp
292313
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/platform.o ../platform/platform.cpp
293314

294-
$(OBJECTS_DIR)/CCNS_wophone.o : ../platform/wophone/CCNS_wophone.cpp
295-
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCNS_wophone.o ../platform/wophone/CCNS_wophone.cpp
315+
$(OBJECTS_DIR)/CCLock.o : ../platform/ios/CCLock.cpp
316+
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCLock.o ../platform/ios/CCLock.cpp
317+
318+
$(OBJECTS_DIR)/CCAccelerometer_wophone.o : ../platform/wophone/CCAccelerometer_wophone.cpp
319+
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCAccelerometer_wophone.o ../platform/wophone/CCAccelerometer_wophone.cpp
296320

297-
$(OBJECTS_DIR)/ccxApplication_wophone.o : ../platform/wophone/ccxApplication_wophone.cpp
298-
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/ccxApplication_wophone.o ../platform/wophone/ccxApplication_wophone.cpp
321+
$(OBJECTS_DIR)/CCApplication_wophone.o : ../platform/wophone/CCApplication_wophone.cpp
322+
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCApplication_wophone.o ../platform/wophone/CCApplication_wophone.cpp
299323

300-
$(OBJECTS_DIR)/CCXEGLView_wophone.o : ../platform/wophone/CCXEGLView_wophone.cpp
301-
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCXEGLView_wophone.o ../platform/wophone/CCXEGLView_wophone.cpp
324+
$(OBJECTS_DIR)/CCEGLView_wophone.o : ../platform/wophone/CCEGLView_wophone.cpp
325+
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCEGLView_wophone.o ../platform/wophone/CCEGLView_wophone.cpp
302326

303-
$(OBJECTS_DIR)/CCXFileUtils_wophone.o : ../platform/wophone/CCXFileUtils_wophone.cpp
304-
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCXFileUtils_wophone.o ../platform/wophone/CCXFileUtils_wophone.cpp
327+
$(OBJECTS_DIR)/CCFileUtils_wophone.o : ../platform/wophone/CCFileUtils_wophone.cpp
328+
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCFileUtils_wophone.o ../platform/wophone/CCFileUtils_wophone.cpp
305329

306-
$(OBJECTS_DIR)/CCXUIAccelerometer_wophone.o : ../platform/wophone/CCXUIAccelerometer_wophone.cpp
307-
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCXUIAccelerometer_wophone.o ../platform/wophone/CCXUIAccelerometer_wophone.cpp
330+
$(OBJECTS_DIR)/CCNS_wophone.o : ../platform/wophone/CCNS_wophone.cpp
331+
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCNS_wophone.o ../platform/wophone/CCNS_wophone.cpp
308332

309333
$(OBJECTS_DIR)/CCAnimation.o : ../sprite_nodes/CCAnimation.cpp
310334
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCAnimation.o ../sprite_nodes/CCAnimation.cpp
@@ -330,15 +354,15 @@ $(OBJECTS_DIR)/CCSpriteSheet.o : ../sprite_nodes/CCSpriteSheet.cpp
330354
$(OBJECTS_DIR)/base64.o : ../support/base64.cpp
331355
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/base64.o ../support/base64.cpp
332356

357+
$(OBJECTS_DIR)/CCPointExtension.o : ../support/CCPointExtension.cpp
358+
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCPointExtension.o ../support/CCPointExtension.cpp
359+
333360
$(OBJECTS_DIR)/CCProfiling.o : ../support/CCProfiling.cpp
334361
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CCProfiling.o ../support/CCProfiling.cpp
335362

336363
$(OBJECTS_DIR)/ccUtils.o : ../support/ccUtils.cpp
337364
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/ccUtils.o ../support/ccUtils.cpp
338365

339-
$(OBJECTS_DIR)/CGPointExtension.o : ../support/CGPointExtension.cpp
340-
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/CGPointExtension.o ../support/CGPointExtension.cpp
341-
342366
$(OBJECTS_DIR)/TransformUtils.o : ../support/TransformUtils.cpp
343367
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/TransformUtils.o ../support/TransformUtils.cpp
344368

0 commit comments

Comments
 (0)