Skip to content

[uphone]fixed #370 #149

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
1 commit merged into from
Mar 4, 2011
Merged

[uphone]fixed #370 #149

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions HelloWorld/AppDelegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,20 @@ bool AppDelegate::initInstance()

#endif // CCX_PLATFORM_WIN32

#if (CCX_TARGET_PLATFORM == CCX_PLATFORM_UPHONE)

// Initialize OpenGLView instance, that release by CCDirector when application terminate.
// The HelloWorld is designed as HVGA.
CCXEGLView* pMainWnd = new CCXEGLView(this);
CCX_BREAK_IF(! pMainWnd || ! pMainWnd->Create(320,480));

#ifndef _TRANZDA_VM_
// on uphone emulator, we copy resources files to Work7/TG3/APP/ folder instead of zip file
cocos2d::CCFileUtils::setResource("HelloWorld.zip");
#endif

#endif // CCX_PLATFORM_UPHONE

bRet = true;
} while (0);
return bRet;
Expand Down
41 changes: 0 additions & 41 deletions HelloWorld/uphone/Application.h
View file
Open in desktop

This file was deleted.

9 changes: 6 additions & 3 deletions HelloWorld/uphone/HelloWorld.TMK3
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ DEFINES=-DCCX_UNDER_UPHONE ;
;DEFINES=-D__TCOM_SUPPORT__ ;���ɵ���TCOM�����ע�⣺TOPSӦ��Ҳ����ͬʱ��TCOM�����

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

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

;ǿ�ư����ļ������֣�����ʹ��ͨ�����һ��Ҫʹ����Ի��߾���·��
;����Ҫ��ʹ�����·��������ļ�֮��ʹ�á�|���ָ�
Expand All @@ -50,4 +50,7 @@ INCLUDEFILE=
;ֻ�ܶ�.c��.cpp�ļ������ų�
;���Ҫ�ų���Ŀ¼���ļ�ҲҪ����"./"
;����ʹ�ö��EXCLUDEFILE����Ҳ����ʹ��EXCLUDEFILE1��EXCLUDEFILE2�ȷ�ʽ��MakeFile�����ݳ���˳��(�������ִ�С)����
EXCLUDEFILE=
EXCLUDEFILE=./android
EXCLUDEFILE=./iphone
EXCLUDEFILE=./win32
EXCLUDEFILE=./uphone/NewDeleteOp.cpp
44 changes: 0 additions & 44 deletions HelloWorld/uphone/HelloWorld.uphone.vcproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,42 +201,6 @@
>
</File>
</Filter>
<Filter
Name="Res"
>
<File
RelativePath=".\Res\HelloWorld_Res.ENU.tr3"
>
</File>
<File
RelativePath=".\Res\HelloWorld_Res.ENU.tr3.tts"
>
</File>
<File
RelativePath=".\Res\HelloWorld_Res.h"
>
</File>
<File
RelativePath=".\Res\HelloWorld_Res.TR3"
>
</File>
<File
RelativePath=".\Res\HelloWorld_Res.TRG"
>
</File>
<File
RelativePath=".\Res\HelloWorld_res_c.h"
>
</File>
<File
RelativePath=".\Res\HelloWorld_res_def.h"
>
</File>
<File
RelativePath=".\Res\HelloWorld_res_h.h"
>
</File>
</Filter>
<Filter
Name="Makefiles"
>
Expand All @@ -252,14 +216,6 @@
<Filter
Name="Framework"
>
<File
RelativePath=".\Application.cpp"
>
</File>
<File
RelativePath=".\Application.h"
>
</File>
<File
RelativePath=".\HelloWorldUnicodeScript.h"
>
Expand Down
4 changes: 0 additions & 4 deletions HelloWorld/uphone/Makefile.ARM
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ first: all

OBJECTS = \
$(OBJECTS_DIR)/AppDelegate.o \
$(OBJECTS_DIR)/Application.o \
$(OBJECTS_DIR)/HelloWorldScene.o \
$(OBJECTS_DIR)/main.o \
$(OBJECTS_DIR)/TG3AppDllEntry.o
Expand All @@ -57,9 +56,6 @@ clean :
$(OBJECTS_DIR)/AppDelegate.o : ../AppDelegate.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/AppDelegate.o ../AppDelegate.cpp

$(OBJECTS_DIR)/Application.o : ./Application.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/Application.o ./Application.cpp

$(OBJECTS_DIR)/HelloWorldScene.o : ../HelloWorldScene.cpp
$(CXX) -c $(CXX_FLAGS) $(INCLUDE_PATH) $(LAST_INCLUDE_PATH) -o $(OBJECTS_DIR)/HelloWorldScene.o ../HelloWorldScene.cpp

Expand Down
64 changes: 0 additions & 64 deletions HelloWorld/uphone/Res/HelloWorld_Res.ENU.tr3
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions HelloWorld/uphone/Res/HelloWorld_Res.ENU.tr3.tts
View file
Open in desktop

This file was deleted.

67 changes: 0 additions & 67 deletions HelloWorld/uphone/Res/HelloWorld_Res.TR3
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions HelloWorld/uphone/Res/HelloWorld_Res.TRG
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions HelloWorld/uphone/Res/HelloWorld_Res.h
View file
Open in desktop

This file was deleted.

Loading