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

fixed #1724: Moved HelloJavascript to template folder and renamed it with "multi-platform-is".

This commit is contained in:
James Chen 2013-02-18 16:25:21 +08:00
parent 9add1d1b18
commit 1d9e9e48bc
37 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
samples/Javascript/HelloJavascript/Classes/AppDelegate.cpp → template/multi-platform-js/Classes/AppDelegate.cpp
View File

0
samples/Javascript/HelloJavascript/Classes/AppDelegate.h → template/multi-platform-js/Classes/AppDelegate.h
View File

0
samples/Javascript/HelloJavascript/Resources/main.js → template/multi-platform-js/Resources/main.js
View File

0
samples/Javascript/HelloJavascript/Resources/res/HelloWorld.png.REMOVED.git-id → template/multi-platform-js/Resources/res/HelloWorld.png.REMOVED.git-id
View File

0
samples/Javascript/HelloJavascript/Resources/src/myApp.js → template/multi-platform-js/Resources/src/myApp.js
View File

0
samples/Javascript/HelloJavascript/Resources/src/resource.js → template/multi-platform-js/Resources/src/resource.js
View File

0
samples/Javascript/HelloJavascript/proj.android/.classpath → template/multi-platform-js/proj.android/.classpath
View File

0
samples/Javascript/HelloJavascript/proj.android/.project → template/multi-platform-js/proj.android/.project
View File

0
samples/Javascript/HelloJavascript/proj.android/AndroidManifest.xml → template/multi-platform-js/proj.android/AndroidManifest.xml
View File

0
samples/Javascript/HelloJavascript/proj.android/ant.properties → template/multi-platform-js/proj.android/ant.properties
View File

0
samples/Javascript/HelloJavascript/proj.android/build.xml → template/multi-platform-js/proj.android/build.xml
View File

4
samples/Javascript/HelloJavascript/proj.android/build_native.sh → template/multi-platform-js/proj.android/build_native.sh
View File

@ -45,10 +45,10 @@ fi
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
# ... use paths relative to current directory
COCOS2DX_ROOT="$DIR/../../../.."
COCOS2DX_ROOT="$DIR/../../.."
APP_ROOT="$DIR/.."
APP_ANDROID_ROOT="$DIR"
BINDINGS_JS_ROOT="$APP_ROOT/../../../scripting/javascript/bindings/js"
BINDINGS_JS_ROOT="$APP_ROOT/../../scripting/javascript/bindings/js"
echo
echo "Paths"

0
samples/Javascript/HelloJavascript/proj.android/jni/Android.mk → template/multi-platform-js/proj.android/jni/Android.mk
View File

0
samples/Javascript/HelloJavascript/proj.android/jni/Application.mk → template/multi-platform-js/proj.android/jni/Application.mk
View File

0
samples/Javascript/HelloJavascript/proj.android/jni/hellojavascript/main.cpp → template/multi-platform-js/proj.android/jni/hellojavascript/main.cpp
View File

0
samples/Javascript/HelloJavascript/proj.android/ndkgdb.sh → template/multi-platform-js/proj.android/ndkgdb.sh
View File

0
samples/Javascript/HelloJavascript/proj.android/proguard-project.txt → template/multi-platform-js/proj.android/proguard-project.txt
View File

2
samples/Javascript/HelloJavascript/proj.android/project.properties → template/multi-platform-js/proj.android/project.properties
View File

@ -10,4 +10,4 @@
# Project target.
target=android-8
android.library.reference.1=../../../../cocos2dx/platform/android/java
android.library.reference.1=../../../cocos2dx/platform/android/java

0
samples/Javascript/HelloJavascript/proj.android/res/values/strings.xml → template/multi-platform-js/proj.android/res/values/strings.xml
View File

0
samples/Javascript/HelloJavascript/proj.android/src/org/cocos2dx/hellojavascript/HelloJavascript.java → template/multi-platform-js/proj.android/src/org/cocos2dx/hellojavascript/HelloJavascript.java
View File

0
samples/Javascript/HelloJavascript/proj.ios/AppController.h → template/multi-platform-js/proj.ios/AppController.h
View File

0
samples/Javascript/HelloJavascript/proj.ios/AppController.mm → template/multi-platform-js/proj.ios/AppController.mm
View File

0
samples/Javascript/HelloJavascript/proj.ios/Default-568h@2x.png.REMOVED.git-id → template/multi-platform-js/proj.ios/Default-568h@2x.png.REMOVED.git-id
View File

0
samples/Javascript/HelloJavascript/proj.ios/Default@2x.png.REMOVED.git-id → template/multi-platform-js/proj.ios/Default@2x.png.REMOVED.git-id
View File

62
samples/Javascript/HelloJavascript/proj.ios/HelloJavascript.xcodeproj/project.pbxproj → template/multi-platform-js/proj.ios/HelloJavascript.xcodeproj/project.pbxproj
View File

@ -152,7 +152,7 @@
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
15A3D2EC1682F076002FB0C5 /* cocos2dx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2dx.xcodeproj; path = ../../../../cocos2dx/proj.ios/cocos2dx.xcodeproj; sourceTree = "<group>"; };
15A3D2EC1682F076002FB0C5 /* cocos2dx.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = cocos2dx.xcodeproj; path = ../../../cocos2dx/proj.ios/cocos2dx.xcodeproj; sourceTree = "<group>"; };
15A3D2FA1682F0A0002FB0C5 /* cocos2d_specifics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cocos2d_specifics.cpp; sourceTree = "<group>"; };
15A3D2FB1682F0A0002FB0C5 /* cocos2d_specifics.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; path = cocos2d_specifics.hpp; sourceTree = "<group>"; };
15A3D2FC1682F0A0002FB0C5 /* cocosjs_manual_conversions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = cocosjs_manual_conversions.cpp; sourceTree = "<group>"; };
@ -471,7 +471,7 @@
15A3D31D1682F0A0002FB0C5 /* uthash.h */,
);
name = bindings;
path = ../../../../scripting/javascript/bindings;
path = ../../../scripting/javascript/bindings;
sourceTree = "<group>";
};
15A3D2FE1682F0A0002FB0C5 /* generated */ = {
@ -506,7 +506,7 @@
15A3D35E1682F0B5002FB0C5 /* src */,
);
name = chipmunk;
path = ../../../../external/chipmunk;
path = ../../../external/chipmunk;
sourceTree = "<group>";
};
15A3D3351682F0B5002FB0C5 /* include */ = {
@ -610,7 +610,7 @@
15A3D3C31682F0D3002FB0C5 /* ios */,
);
name = CocosDenshion;
path = ../../../../CocosDenshion;
path = ../../../CocosDenshion;
sourceTree = "<group>";
};
15A3D3C01682F0D3002FB0C5 /* include */ = {
@ -650,7 +650,7 @@
15A3D5151682F1A4002FB0C5 /* physics_nodes */,
);
name = extensions;
path = ../../../../extensions;
path = ../../../extensions;
sourceTree = "<group>";
};
15A3D4AB1682F1A4002FB0C5 /* CCBReader */ = {
@ -1089,10 +1089,10 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../../cocos2dx",
"$(SRCROOT)/../../../cocos2dx/include",
"$(SRCROOT)/../../../cocos2dx/platform/ios",
"$(SRCROOT)/../../../scripting/javascript/spidermonkey-ios/include1",
"$(SRCROOT)/../../cocos2dx",
"$(SRCROOT)/../../cocos2dx/include",
"$(SRCROOT)/../../cocos2dx/platform/ios",
"$(SRCROOT)/../../scripting/javascript/spidermonkey-ios/include1",
);
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
SDKROOT = iphoneos;
@ -1113,10 +1113,10 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../../cocos2dx",
"$(SRCROOT)/../../../cocos2dx/include",
"$(SRCROOT)/../../../cocos2dx/platform/ios",
"$(SRCROOT)/../../../scripting/javascript/spidermonkey-ios/include1",
"$(SRCROOT)/../../cocos2dx",
"$(SRCROOT)/../../cocos2dx/include",
"$(SRCROOT)/../../cocos2dx/platform/ios",
"$(SRCROOT)/../../scripting/javascript/spidermonkey-ios/include1",
);
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
@ -1144,19 +1144,19 @@
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = "";
HEADER_SEARCH_PATHS = (
"\"$(SRCROOT)/../../../../cocos2dx\"",
"\"$(SRCROOT)/../../../../cocos2dx/kazmath/include\"",
"\"$(SRCROOT)/../../../../CocosDenshion/include\"",
"\"$(SRCROOT)/../../../cocos2dx\"",
"\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"",
"\"$(SRCROOT)/../../../CocosDenshion/include\"",
"\"$(SDKROOT)/usr/include/libxml2\"",
"$(SRCROOT)/../../../../cocos2dx/include",
"$(SRCROOT)/../../../../cocos2dx/platform/ios",
"$(SRCROOT)/../../../../external/chipmunk/include/chipmunk",
"$(SRCROOT)/../../../../scripting/javascript/spidermonkey-ios/include",
"$(SRCROOT)/../../../../scripting/javascript/bindings",
"$(SRCROOT)/../../../cocos2dx/include",
"$(SRCROOT)/../../../cocos2dx/platform/ios",
"$(SRCROOT)/../../../external/chipmunk/include/chipmunk",
"$(SRCROOT)/../../../scripting/javascript/spidermonkey-ios/include",
"$(SRCROOT)/../../../scripting/javascript/bindings",
);
INFOPLIST_FILE = Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../../scripting/javascript/spidermonkey-ios/lib\"";
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../scripting/javascript/spidermonkey-ios/lib\"";
OTHER_LDFLAGS = (
"-lxml2",
"-lz",
@ -1185,19 +1185,19 @@
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = "";
HEADER_SEARCH_PATHS = (
"\"$(SRCROOT)/../../../../cocos2dx\"",
"\"$(SRCROOT)/../../../../cocos2dx/kazmath/include\"",
"\"$(SRCROOT)/../../../../CocosDenshion/include\"",
"\"$(SRCROOT)/../../../cocos2dx\"",
"\"$(SRCROOT)/../../../cocos2dx/kazmath/include\"",
"\"$(SRCROOT)/../../../CocosDenshion/include\"",
"\"$(SDKROOT)/usr/include/libxml2\"",
"$(SRCROOT)/../../../../cocos2dx/include",
"$(SRCROOT)/../../../../cocos2dx/platform/ios",
"$(SRCROOT)/../../../../external/chipmunk/include/chipmunk",
"$(SRCROOT)/../../../../scripting/javascript/spidermonkey-ios/include",
"$(SRCROOT)/../../../../scripting/javascript/bindings",
"$(SRCROOT)/../../../cocos2dx/include",
"$(SRCROOT)/../../../cocos2dx/platform/ios",
"$(SRCROOT)/../../../external/chipmunk/include/chipmunk",
"$(SRCROOT)/../../../scripting/javascript/spidermonkey-ios/include",
"$(SRCROOT)/../../../scripting/javascript/bindings",
);
INFOPLIST_FILE = Info.plist;
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../../scripting/javascript/spidermonkey-ios/lib\"";
LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../scripting/javascript/spidermonkey-ios/lib\"";
OTHER_LDFLAGS = (
"-lxml2",
"-lz",

0
samples/Javascript/HelloJavascript/proj.ios/Prefix.pch → template/multi-platform-js/proj.ios/Prefix.pch
View File

0
samples/Javascript/HelloJavascript/proj.ios/RootViewController.h → template/multi-platform-js/proj.ios/RootViewController.h
View File

0
samples/Javascript/HelloJavascript/proj.ios/RootViewController.mm → template/multi-platform-js/proj.ios/RootViewController.mm
View File

0
samples/Javascript/HelloJavascript/proj.ios/main.m → template/multi-platform-js/proj.ios/main.m
View File

16
samples/Javascript/HelloJavascript/proj.win32/HelloJavascript.vcxproj → template/multi-platform-js/proj.win32/HelloJavascript.vcxproj
View File

@ -75,7 +75,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(ProjectDir)..\..\..\..\scripting\javascript\spidermonkey-win32\include;$(ProjectDir)..\..\..\..\external\chipmunk\include\chipmunk;$(ProjectDir)..\..\..\..\extensions;$(ProjectDir)..\..\..\..\scripting\javascript\bindings;$(ProjectDir)..\..\..\..\cocos2dx;$(ProjectDir)..\..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\..\CocosDenshion\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(ProjectDir)..\..\..\scripting\javascript\spidermonkey-win32\include;$(ProjectDir)..\..\..\external\chipmunk\include\chipmunk;$(ProjectDir)..\..\..\extensions;$(ProjectDir)..\..\..\scripting\javascript\bindings;$(ProjectDir)..\..\..\cocos2dx;$(ProjectDir)..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\CocosDenshion\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;DEBUG;_DEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_DEBUG=1;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -93,7 +93,7 @@
</ResourceCompile>
<PreLinkEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
xcopy /Y /Q "$(ProjectDir)..\..\..\..\scripting\javascript\spidermonkey-win32\lib\*.*" "$(OutDir)"
xcopy /Y /Q "$(ProjectDir)..\..\..\scripting\javascript\spidermonkey-win32\lib\*.*" "$(OutDir)"
</Command>
</PreLinkEvent>
<Link>
@ -107,7 +107,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\scripting\javascript\spidermonkey-win32\li
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
if exist "$(OutDir)\HelloJavascriptRes" rd /s /q "$(OutDir)\HelloJavascriptRes"
mkdir "$(OutDir)\HelloJavascriptRes"
xcopy "$(ProjectDir)..\..\..\..\scripting\javascript\bindings\js\*.js" "$(OutDir)\HelloJavascriptRes\" /e /Y
xcopy "$(ProjectDir)..\..\..\scripting\javascript\bindings\js\*.js" "$(OutDir)\HelloJavascriptRes\" /e /Y
xcopy "$(ProjectDir)..\..\Shared\tests" "$(OutDir)\HelloJavascriptRes\" /e /Y</Command>
</PreBuildEvent>
<PreBuildEvent>
@ -128,7 +128,7 @@ xcopy "$(ProjectDir)..\..\Shared\tests" "$(OutDir)\HelloJavascriptRes\" /e /Y</C
<ProxyFileName>testjs_p.c</ProxyFileName>
</Midl>
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(ProjectDir)..\..\..\..\scripting\javascript\spidermonkey-win32\include;$(ProjectDir)..\..\..\..\external\chipmunk\include\chipmunk;$(ProjectDir)..\..\..\..\extensions;$(ProjectDir)..\..\..\..\scripting\javascript\bindings;$(ProjectDir)..\..\..\..\cocos2dx;$(ProjectDir)..\..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32;$(ProjectDir)..\..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\..\CocosDenshion\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\Classes;$(ProjectDir)..\..\..\scripting\javascript\spidermonkey-win32\include;$(ProjectDir)..\..\..\external\chipmunk\include\chipmunk;$(ProjectDir)..\..\..\extensions;$(ProjectDir)..\..\..\scripting\javascript\bindings;$(ProjectDir)..\..\..\cocos2dx;$(ProjectDir)..\..\..\cocos2dx\include;$(ProjectDir)..\..\..\cocos2dx\kazmath\include;$(ProjectDir)..\..\..\cocos2dx\platform\win32;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32;$(ProjectDir)..\..\..\cocos2dx\platform\third_party\win32\OGLES;$(ProjectDir)..\..\..\CocosDenshion\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;NDEBUG;XP_WIN;JS_HAVE___INTN;JS_INTPTR_TYPE=int;COCOS2D_JAVASCRIPT=1;CC_ENABLE_CHIPMUNK_INTEGRATION=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>
</ExceptionHandling>
@ -147,7 +147,7 @@ xcopy "$(ProjectDir)..\..\Shared\tests" "$(OutDir)\HelloJavascriptRes\" /e /Y</C
</ResourceCompile>
<PreLinkEvent>
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
xcopy /Y /Q "$(ProjectDir)..\..\..\..\scripting\javascript\spidermonkey-win32\lib\*.*" "$(OutDir)"
xcopy /Y /Q "$(ProjectDir)..\..\..\scripting\javascript\spidermonkey-win32\lib\*.*" "$(OutDir)"
</Command>
</PreLinkEvent>
<Link>
@ -160,7 +160,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\..\..\scripting\javascript\spidermonkey-win32\li
<Command>if not exist "$(OutDir)" mkdir "$(OutDir)"
if exist "$(OutDir)\HelloJavascriptRes" rd /s /q "$(OutDir)\HelloJavascriptRes"
mkdir "$(OutDir)\HelloJavascriptRes"
xcopy "$(ProjectDir)..\..\..\..\scripting\javascript\bindings\js\*.js" "$(OutDir)\HelloJavascriptRes\" /e /Y
xcopy "$(ProjectDir)..\..\..\scripting\javascript\bindings\js\*.js" "$(OutDir)\HelloJavascriptRes\" /e /Y
xcopy "$(ProjectDir)..\..\Shared\tests" "$(OutDir)\HelloJavascriptRes\" /e /Y</Command>
<Message>Copy js and resource files.</Message>
</PreBuildEvent>
@ -181,11 +181,11 @@ xcopy "$(ProjectDir)..\..\Shared\tests" "$(OutDir)\HelloJavascriptRes\" /e /Y</C
<ResourceCompile Include="testjs.rc" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\cocos2dx\proj.win32\cocos2d.vcxproj">
<ProjectReference Include="..\..\..\cocos2dx\proj.win32\cocos2d.vcxproj">
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
<ProjectReference Include="..\..\..\..\CocosDenshion\proj.win32\CocosDenshion.vcxproj">
<ProjectReference Include="..\..\..\CocosDenshion\proj.win32\CocosDenshion.vcxproj">
<Project>{f8edd7fa-9a51-4e80-baeb-860825d2eac6}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>

0
samples/Javascript/HelloJavascript/proj.win32/HelloJavascript.vcxproj.filters → template/multi-platform-js/proj.win32/HelloJavascript.vcxproj.filters
View File

0
samples/Javascript/HelloJavascript/proj.win32/HelloJavascript.vcxproj.user → template/multi-platform-js/proj.win32/HelloJavascript.vcxproj.user
View File

0
samples/Javascript/HelloJavascript/proj.win32/main.cpp → template/multi-platform-js/proj.win32/main.cpp
View File

0
samples/Javascript/HelloJavascript/proj.win32/main.h → template/multi-platform-js/proj.win32/main.h
View File

0
samples/Javascript/HelloJavascript/proj.win32/res/testjs.ico → template/multi-platform-js/proj.win32/res/testjs.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

0
samples/Javascript/HelloJavascript/proj.win32/resource.h → template/multi-platform-js/proj.win32/resource.h
View File

0
samples/Javascript/HelloJavascript/proj.win32/testjs.rc → template/multi-platform-js/proj.win32/testjs.rc
View File