Skip to content

Commit 8581bf1

Browse files
MeychiMeychi
committed
Merge pull request #907 from Neverbirth/64bits
Native 64bits support
2 parents abde46f + 0f0c864 commit 8581bf1

24 files changed

+566
-666
lines changed

‎External/Plugins/AirProperties/Controls/TableLayoutPanelExtensions.cs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,3 @@ public static void RemoveRow(this TableLayoutPanel tableLayoutPanel, int rowNumb
3333
}
3434

3535
}
36-
37-
// You need this once (only), and it must be in this namespace
38-
namespace System.Runtime.CompilerServices
39-
{
40-
[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)]
41-
public sealed class ExtensionAttribute : Attribute {}
42-
}

‎External/Plugins/BookmarkPanel/BookmarkPanel.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
5151
<DebugType>None</DebugType>
5252
<Optimize>true</Optimize>
53-
<OutputPath>bin\</OutputPath>
53+
<OutputPath>..\..\..\FlashDevelop\Bin\Debug\Plugins\</OutputPath>
5454
<DefineConstants>TRACE</DefineConstants>
5555
<ErrorReport>prompt</ErrorReport>
5656
<WarningLevel>4</WarningLevel>

‎External/Plugins/FlashDebugger/FlashDebugger.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@
8585
<SpecificVersion>False</SpecificVersion>
8686
<HintPath>.\fdb.j4n.dll</HintPath>
8787
</Reference>
88-
<Reference Include="jni4net.n-0.8.4.0, Version=0.8.4.0, Culture=neutral, PublicKeyToken=134a23405600bab4, processorArchitecture=MSIL">
88+
<Reference Include="jni4net.n-0.8.8.0, Version=0.8.8.0, Culture=neutral, PublicKeyToken=134a23405600bab4, processorArchitecture=MSIL">
8989
<SpecificVersion>False</SpecificVersion>
90-
<HintPath>.\jni4net.n-0.8.4.0.dll</HintPath>
90+
<HintPath>.\jni4net.n-0.8.8.0.dll</HintPath>
9191
</Reference>
9292
<Reference Include="System" />
9393
<Reference Include="System.Design" />
@@ -195,10 +195,10 @@
195195
<Content Include="Icons\RunToCursor.png" />
196196
<Content Include="Icons\Stop.png" />
197197
<None Include="Icons\ToggleBreakpoints.png" />
198-
<Content Include="jni4net.j-0.8.4.0.jar">
198+
<Content Include="jni4net.j-0.8.8.0.jar">
199199
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
200200
</Content>
201-
<Content Include="jni4net.n.w32.v20-0.8.4.0.dll">
201+
<Content Include="jni4net.n.w32.v20-0.8.8.0.dll">
202202
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
203203
</Content>
204204
</ItemGroup>

‎External/Plugins/FlashDebugger/build.cmd

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,27 +10,27 @@ IF %ERRORLEVEL% NEQ 0 goto err
1010

1111
mkdir generated\bin
1212

13-
javac -nowarn -d generated\bin -sourcepath generated\jvm -cp "jni4net.j-0.8.4.0.jar";"%FLEX_HOME%\lib\fdb.jar" generated\jvm\flash\tools\debugger\*.java
13+
javac -nowarn -d generated\bin -sourcepath generated\jvm -cp "jni4net.j-0.8.8.0.jar";"%FLEX_HOME%\lib\fdb.jar" generated\jvm\flash\tools\debugger\*.java
1414
IF %ERRORLEVEL% NEQ 0 goto err
15-
javac -nowarn -d generated\bin -sourcepath generated\jvm -cp "jni4net.j-0.8.4.0.jar";"%FLEX_HOME%\lib\fdb.jar" generated\jvm\flash\tools\debugger\events\*.java
15+
javac -nowarn -d generated\bin -sourcepath generated\jvm -cp "jni4net.j-0.8.8.0.jar";"%FLEX_HOME%\lib\fdb.jar" generated\jvm\flash\tools\debugger\events\*.java
1616
IF %ERRORLEVEL% NEQ 0 goto err
17-
::javac -nowarn -d generated\bin -sourcepath generated\jvm -cp "jni4net.j-0.8.4.0.jar";"%FLEX_HOME%\lib\fdb.jar" generated\jvm\flash\tools\debugger\threadsafe\*.java
17+
::javac -nowarn -d generated\bin -sourcepath generated\jvm -cp "jni4net.j-0.8.8.0.jar";"%FLEX_HOME%\lib\fdb.jar" generated\jvm\flash\tools\debugger\threadsafe\*.java
1818
::IF %ERRORLEVEL% NEQ 0 goto err
19-
javac -nowarn -d generated\bin -sourcepath generated\jvm -cp "jni4net.j-0.8.4.0.jar";"%FLEX_HOME%\lib\fdb.jar" generated\jvm\flash\tools\debugger\expression\*.java
19+
javac -nowarn -d generated\bin -sourcepath generated\jvm -cp "jni4net.j-0.8.8.0.jar";"%FLEX_HOME%\lib\fdb.jar" generated\jvm\flash\tools\debugger\expression\*.java
2020
IF %ERRORLEVEL% NEQ 0 goto err
21-
javac -nowarn -d generated\bin -sourcepath generated\jvm -cp "jni4net.j-0.8.4.0.jar";"%FLEX_HOME%\lib\fdb.jar" generated\jvm\java_\io\*.java
21+
javac -nowarn -d generated\bin -sourcepath generated\jvm -cp "jni4net.j-0.8.8.0.jar";"%FLEX_HOME%\lib\fdb.jar" generated\jvm\java_\io\*.java
2222
IF %ERRORLEVEL% NEQ 0 goto err
23-
javac -nowarn -d generated\bin -sourcepath generated\jvm -cp "jni4net.j-0.8.4.0.jar";"%FLEX_HOME%\lib\fdb.jar" generated\jvm\java_\net\*.java
23+
javac -nowarn -d generated\bin -sourcepath generated\jvm -cp "jni4net.j-0.8.8.0.jar";"%FLEX_HOME%\lib\fdb.jar" generated\jvm\java_\net\*.java
2424
IF %ERRORLEVEL% NEQ 0 goto err
25-
::javac -nowarn -d generated\bin -sourcepath generated\jvm -cp "jni4net.j-0.8.4.0.jar";"%FLEX_HOME%\lib\fdb.jar" generated\jvm\flex\tools\debugger\cli\*.java
25+
::javac -nowarn -d generated\bin -sourcepath generated\jvm -cp "jni4net.j-0.8.8.0.jar";"%FLEX_HOME%\lib\fdb.jar" generated\jvm\flex\tools\debugger\cli\*.java
2626
::IF %ERRORLEVEL% NEQ 0 goto err
27-
javac -nowarn -d generated\bin -sourcepath generated\jvm -cp "jni4net.j-0.8.4.0.jar";"%FLEX_HOME%\lib\fdb.jar" generated\jvm\flash\tools\debugger\concrete\*.java
27+
javac -nowarn -d generated\bin -sourcepath generated\jvm -cp "jni4net.j-0.8.8.0.jar";"%FLEX_HOME%\lib\fdb.jar" generated\jvm\flash\tools\debugger\concrete\*.java
2828
IF %ERRORLEVEL% NEQ 0 goto err
2929

3030
jar cvf fbd.j4n.jar -C generated\bin "."
3131
IF %ERRORLEVEL% NEQ 0 goto err
3232

33-
c:\Windows\Microsoft.NET\Framework\v2.0.50727\csc.exe /debug+ /nologo /warn:0 /t:library /out:fdb.j4n.dll /recurse:generated\clr\*.cs /reference:"jni4net.n-0.8.4.0.dll"
33+
c:\Windows\Microsoft.NET\Framework\v2.0.50727\csc.exe /debug+ /nologo /warn:0 /t:library /out:fdb.j4n.dll /recurse:generated\clr\*.cs /reference:"jni4net.n-0.8.8.0.dll"
3434
::csc /debug+ /nologo /warn:0 /t:library /out:fdb.j4n.dll /recurse:generated\clr\*.cs /reference:"jni4net.n-0.8.4.0.dll"
3535
IF %ERRORLEVEL% NEQ 0 goto err
3636

‎External/Plugins/FlashDebugger/fdb.j4n.dll

0 Bytes
Binary file not shown.

‎External/Plugins/FlashDebugger/fdb.proxygen.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ You should have received a copy of the GNU General Public License
1717
along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
-->
1919

20-
<jni4net-proxygen xmlns="http://jni4net.sf.net/0.8.4.0/toolConfig.xsd">
20+
<jni4net-proxygen xmlns="http://jni4net.sf.net/0.8.8.0/toolConfig.xsd">
2121

2222
<TargetDirJvm>generated\jvm</TargetDirJvm>
2323
<TargetDirClr>generated\clr</TargetDirClr>

‎External/Plugins/FlashDebugger/jni4net-LGPL-3.0.txt

Lines changed: 0 additions & 165 deletions
This file was deleted.

‎External/Plugins/FlashDebugger/jni4net-MIT.txt

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
The MIT License (MIT)
2+
3+
Copyright (c) 2014 Pavel Savara <[email protected]>
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in
13+
all copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
21+
THE SOFTWARE.

‎External/Plugins/FlashDebugger/jni4net.j-0.8.4.0.jar renamed to ‎External/Plugins/FlashDebugger/jni4net.j-0.8.8.0.jar

154 KB
Binary file not shown.

‎External/Plugins/FlashDebugger/jni4net.n-0.8.4.0.dll

-880 KB
Binary file not shown.

0 commit comments

Comments
 (0)