diff --git a/.cproject b/.cproject deleted file mode 100644 index 797ad08..0000000 --- a/.cproject +++ /dev/null @@ -1,454 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Box2D/.cproject b/Box2D/.cproject new file mode 100644 index 0000000..640fcf2 --- /dev/null +++ b/Box2D/.cproject @@ -0,0 +1,570 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.project b/Box2D/.project similarity index 93% rename from .project rename to Box2D/.project index b9ad674..136cf50 100644 --- a/.project +++ b/Box2D/.project @@ -1,6 +1,6 @@ - box2d + Box2D @@ -27,7 +27,7 @@ org.eclipse.cdt.make.core.buildLocation - ${workspace_loc:/box2d/Device-Debug} + ${workspace_loc:/Box2D/Device-Debug} org.eclipse.cdt.make.core.contents diff --git a/Box2D/.settings/org.eclipse.cdt.codan.core.prefs b/Box2D/.settings/org.eclipse.cdt.codan.core.prefs new file mode 100644 index 0000000..012f734 --- /dev/null +++ b/Box2D/.settings/org.eclipse.cdt.codan.core.prefs @@ -0,0 +1,66 @@ +#Thu May 17 16:13:17 EDT 2012 +eclipse.preferences.version=1 +org.eclipse.cdt.codan.checkers.errnoreturn=Warning +org.eclipse.cdt.codan.checkers.errnoreturn.params={implicit\=>false} +org.eclipse.cdt.codan.checkers.errreturnvalue=Error +org.eclipse.cdt.codan.checkers.errreturnvalue.params={} +org.eclipse.cdt.codan.checkers.noreturn=Error +org.eclipse.cdt.codan.checkers.noreturn.params={implicit\=>false} +org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation=-Error +org.eclipse.cdt.codan.internal.checkers.AbstractClassCreation.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} +org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem=-Error +org.eclipse.cdt.codan.internal.checkers.AmbiguousProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} +org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem=Warning +org.eclipse.cdt.codan.internal.checkers.AssignmentInConditionProblem.params={} +org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem=Error +org.eclipse.cdt.codan.internal.checkers.AssignmentToItselfProblem.params={} +org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem=Warning +org.eclipse.cdt.codan.internal.checkers.CaseBreakProblem.params={no_break_comment\=>"no break",last_case_param\=>true,empty_case_param\=>false} +org.eclipse.cdt.codan.internal.checkers.CatchByReference=Warning +org.eclipse.cdt.codan.internal.checkers.CatchByReference.params={unknown\=>false,exceptions\=>()} +org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem=-Error +org.eclipse.cdt.codan.internal.checkers.CircularReferenceProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} +org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem=-Error +org.eclipse.cdt.codan.internal.checkers.FieldResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} +org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem=-Error +org.eclipse.cdt.codan.internal.checkers.FunctionResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} +org.eclipse.cdt.codan.internal.checkers.InvalidArguments=-Error +org.eclipse.cdt.codan.internal.checkers.InvalidArguments.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} +org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem=-Error +org.eclipse.cdt.codan.internal.checkers.InvalidTemplateArgumentsProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} +org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem=-Error +org.eclipse.cdt.codan.internal.checkers.LabelStatementNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} +org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem=-Error +org.eclipse.cdt.codan.internal.checkers.MemberDeclarationNotFoundProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} +org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem=-Error +org.eclipse.cdt.codan.internal.checkers.MethodResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} +org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker=-Info +org.eclipse.cdt.codan.internal.checkers.NamingConventionFunctionChecker.params={pattern\=>"^[a-z]",macro\=>true,exceptions\=>()} +org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem=Warning +org.eclipse.cdt.codan.internal.checkers.NonVirtualDestructorProblem.params={} +org.eclipse.cdt.codan.internal.checkers.OverloadProblem=-Error +org.eclipse.cdt.codan.internal.checkers.OverloadProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} +org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem=-Error +org.eclipse.cdt.codan.internal.checkers.RedeclarationProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} +org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem=-Error +org.eclipse.cdt.codan.internal.checkers.RedefinitionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} +org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem=-Warning +org.eclipse.cdt.codan.internal.checkers.ReturnStyleProblem.params={} +org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem=-Warning +org.eclipse.cdt.codan.internal.checkers.ScanfFormatStringSecurityProblem.params={} +org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem=Warning +org.eclipse.cdt.codan.internal.checkers.StatementHasNoEffectProblem.params={macro\=>true,exceptions\=>()} +org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem=Warning +org.eclipse.cdt.codan.internal.checkers.SuggestedParenthesisProblem.params={paramNot\=>false} +org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem=Warning +org.eclipse.cdt.codan.internal.checkers.SuspiciousSemicolonProblem.params={else\=>false,afterelse\=>false} +org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem=-Error +org.eclipse.cdt.codan.internal.checkers.TypeResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} +org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem=Warning +org.eclipse.cdt.codan.internal.checkers.UnusedFunctionDeclarationProblem.params={macro\=>true} +org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem=Warning +org.eclipse.cdt.codan.internal.checkers.UnusedStaticFunctionProblem.params={macro\=>true} +org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem=Warning +org.eclipse.cdt.codan.internal.checkers.UnusedVariableDeclarationProblem.params={macro\=>true,exceptions\=>("@(\#)","$Id")} +org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem=-Error +org.eclipse.cdt.codan.internal.checkers.VariableResolutionProblem.params={launchModes\=>{RUN_ON_FULL_BUILD\=>false,RUN_ON_INC_BUILD\=>false,RUN_AS_YOU_TYPE\=>true,RUN_ON_DEMAND\=>true}} diff --git a/Building.txt b/Building.txt index 63c0d6d..9126e2a 100644 --- a/Building.txt +++ b/Building.txt @@ -11,7 +11,14 @@ Following this, the relevant binaries should reside in the following subdirector [box2d]/qnx/Box2D/arm/a.le.v7.g (ARM debug) [box2d]/qnx/Box2D/x86/a (x86 simulator release) [box2d]/qnx/Box2D/x86/a.g (x86 simulator debug) -s + +To build for BlackBerry (QNX-based) platform from Momentics IDE: +- Right click on Project Explorer->Import. +- Select "Existing Existing Project into Workspace"->Next +- Select "Select root directory:" as [box2d] +- Check the "Box2D" project and optionally HelloWorld and Testbed samples (without copying project option). Then click Finish. +- Right click the "Box2D" project then "Build". + For other platforms you need to run premake in this directory. You can get premake here: http://industriousone.com/premake diff --git a/HelloWorld/.cproject b/HelloWorld/.cproject index 37c435b..b6634c3 100644 --- a/HelloWorld/.cproject +++ b/HelloWorld/.cproject @@ -38,33 +38,26 @@ - @@ -180,11 +172,11 @@ @@ -227,13 +219,13 @@ @@ -241,11 +233,11 @@ @@ -286,24 +278,24 @@ @@ -345,13 +337,13 @@ @@ -359,11 +351,11 @@ @@ -405,13 +397,13 @@ @@ -419,11 +411,11 @@ diff --git a/HelloWorld/.project b/HelloWorld/.project index d17439d..e802a04 100644 --- a/HelloWorld/.project +++ b/HelloWorld/.project @@ -1,8 +1,9 @@ - box2dHelloWorld + HelloWorld + Box2D diff --git a/HelloWorld/bar-descriptor.xml b/HelloWorld/bar-descriptor.xml index 74574ac..65fc529 100644 --- a/HelloWorld/bar-descriptor.xml +++ b/HelloWorld/bar-descriptor.xml @@ -9,11 +9,11 @@ - com.example.box2dHelloWorld + org.box2d.HelloWorld - box2dHelloWorld + HelloWorld - The box2dHelloWorld application + HelloWorld - Example Inc. + RIM Canada @@ -48,34 +48,34 @@ core.games icon.png - lib/libbps.so.1 + armle-v7 - box2dHelloWorld + HelloWorld armle-v7 - box2dHelloWorld + HelloWorld armle-v7 - box2dHelloWorld + HelloWorld armle-v7 - box2dHelloWorld + HelloWorld x86 - box2dHelloWorld + HelloWorld x86 - box2dHelloWorld + HelloWorld x86 - box2dHelloWorld + HelloWorld diff --git a/Testbed/.cproject b/Testbed/.cproject index f9d1ec3..d353899 100644 --- a/Testbed/.cproject +++ b/Testbed/.cproject @@ -28,11 +28,11 @@ @@ -44,7 +44,7 @@ @@ -103,11 +103,11 @@ @@ -117,7 +117,7 @@ @@ -194,7 +194,7 @@ @@ -251,11 +251,11 @@ @@ -268,7 +268,7 @@ @@ -323,11 +323,11 @@ @@ -339,7 +339,7 @@ @@ -395,11 +395,11 @@ @@ -412,7 +412,7 @@ @@ -468,11 +468,11 @@ @@ -485,7 +485,7 @@ diff --git a/Testbed/.project b/Testbed/.project index 8849000..c8dd4da 100644 --- a/Testbed/.project +++ b/Testbed/.project @@ -1,8 +1,9 @@ - box2dTestbed + Testbed + Box2D diff --git a/Testbed/bar-descriptor.xml b/Testbed/bar-descriptor.xml index 9cd39c6..ffe87c5 100644 --- a/Testbed/bar-descriptor.xml +++ b/Testbed/bar-descriptor.xml @@ -9,11 +9,11 @@ - com.example.box2dTestbed + org.box2d.Testbed - box2dTestbed + Testbed - The box2dTestbed application + Testbed - Example Inc. + RIM Canada @@ -48,34 +48,34 @@ core.games icon.png - lib/libbps.so.1 + armle-v7 - box2dTestbed + Testbed armle-v7 - box2dTestbed + Testbed - + armle-v7 - box2dTestbed + Testbed - + armle-v7 - box2dTestbed + Testbed - + x86 - box2dTestbed + Testbed - + x86 - box2dTestbed + Testbed - + x86 - box2dTestbed + Testbed