rik/mimis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of C:/Users/Rik/Git/project/mimis/mimis into sound

Browse Source 
Conflicts:
	.gitignore
This commit is contained in:
Rik Veenboer
2013-12-02 20:41:34 +00:00
parent 5b0d8bd977 1b005c69f5
commit e0ecdc998c
29 changed files with 39 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@@ -1,7 +1,9 @@
bin bin
Debug/src
Release/src
.gradle .gradle
.settings .settings
build build
<<<<<<< HEAD
/cpp/pipe/Release/src /cpp/pipe/Release/src
=======
src
>>>>>>> 1b005c69f5ba5b443ef5addc6aad13236196f3dc

16
cpp/mimis/.cproject
View File

@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?> <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings"> <storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="cdt.managedbuild.config.gnu.mingw.exe.debug.850231290"> <cconfiguration id="cdt.managedbuild.config.gnu.mingw.exe.debug.850231290">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.debug.850231290" moduleId="org.eclipse.cdt.core.settings" name="Debug"> <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.debug.850231290" moduleId="org.eclipse.cdt.core.settings" name="Debug">
@@ -21,8 +19,6 @@
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> <extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
</extensions> </extensions>
</storageModule> </storageModule>
<storageModule moduleId="cdtBuildSystem" version="4.0.0"> <storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -30,7 +26,7 @@
<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.850231290." name="/" resourcePath=""> <folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.850231290." name="/" resourcePath="">
<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.debug.1828925779" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.debug"> <toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.debug.1828925779" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.debug">
<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.debug.759162706" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.debug"/> <targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.debug.759162706" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.debug"/>
<builder buildPath="${workspace_loc:/Mimis library/Debug}" id="cdt.managedbuild.target.gnu.builder.base.1712709797" superClass="cdt.managedbuild.target.gnu.builder.base"/> <builder buildPath="${workspace_loc:/Mimis library/Debug}" id="org.eclipse.cdt.build.core.internal.builder.101482938" superClass="org.eclipse.cdt.build.core.internal.builder"/>
<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug.2073686457" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug"> <tool id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug.2073686457" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug">
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.589684161" superClass="cdt.managedbuild.tool.gnu.assembler.input"/> <inputType id="cdt.managedbuild.tool.gnu.assembler.input.589684161" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
</tool> </tool>
@@ -58,6 +54,10 @@
</tool> </tool>
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.debug.2031822380" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.debug"> <tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.debug.2031822380" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.debug">
<option defaultValue="true" id="gnu.cpp.link.option.shared.772342780" name="Shared (-shared)" superClass="gnu.cpp.link.option.shared" valueType="boolean"/> <option defaultValue="true" id="gnu.cpp.link.option.shared.772342780" name="Shared (-shared)" superClass="gnu.cpp.link.option.shared" valueType="boolean"/>
<option id="gnu.cpp.link.option.flags.1293821467" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-Wl,-add-stdcall-alias -static-libgcc -static-libstdc++" valueType="string"/>
<option id="gnu.cpp.link.option.strip.2056105731" name="Omit all symbol information (-s)" superClass="gnu.cpp.link.option.strip" value="false" valueType="boolean"/>
<option id="gnu.cpp.link.option.nostdlibs.1324266543" name="No startup or default libs (-nostdlib)" superClass="gnu.cpp.link.option.nostdlibs" value="false" valueType="boolean"/>
<option id="gnu.cpp.link.option.nodeflibs.1105061355" name="Do not use default libraries (-nodefaultlibs)" superClass="gnu.cpp.link.option.nodeflibs" value="false" valueType="boolean"/>
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.118183058" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input"> <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.118183058" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/> <additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@ -123,6 +123,10 @@
</tool> </tool>
<tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.release.1036255767" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.release"> <tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.release.1036255767" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.release">
<option defaultValue="true" id="gnu.cpp.link.option.shared.1672917672" name="Shared (-shared)" superClass="gnu.cpp.link.option.shared" valueType="boolean"/> <option defaultValue="true" id="gnu.cpp.link.option.shared.1672917672" name="Shared (-shared)" superClass="gnu.cpp.link.option.shared" valueType="boolean"/>
<option id="gnu.cpp.link.option.flags.837724797" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-Wl,-add-stdcall-alias -static-libgcc -static-libstdc++" valueType="string"/>
<option id="gnu.cpp.link.option.strip.559201662" name="Omit all symbol information (-s)" superClass="gnu.cpp.link.option.strip" value="false" valueType="boolean"/>
<option id="gnu.cpp.link.option.nostdlibs.863245435" name="No startup or default libs (-nostdlib)" superClass="gnu.cpp.link.option.nostdlibs" value="false" valueType="boolean"/>
<option id="gnu.cpp.link.option.nodeflibs.1983716612" name="Do not use default libraries (-nodefaultlibs)" superClass="gnu.cpp.link.option.nodeflibs" value="false" valueType="boolean"/>
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1374294851" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input"> <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1374294851" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/> <additionalInput kind="additionalinput" paths="$(LIBS)"/>

2
cpp/mimis/Debug/copy.bat
View File

@@ -1 +1 @@
copy mimis.dll ..\..\..\java\mimis.dll copy mimis.dll ..\..\..\java\mimis\mimis.dll

2
cpp/mimis/Release/copy.bat
View File

@@ -1 +1 @@
copy mimis.dll ..\..\..\java\mimis.dll copy mimis.dll ..\..\..\java\mimis\mimis.dll

BIN
cpp/mimis/Release/mimis.dll
View File

Binary file not shown.

BIN
cpp/wiipair/Debug/wiipair.exe
View File

Binary file not shown.

BIN
cpp/wiiscan/lib/wiiuse.lib
View File

Binary file not shown.

10
cpp/wiiuse/Debug/copy.bat
View File

@@ -1,5 +1,5 @@
copy ..\src\wiiuse.h ..\..\WiiuseJ\include\wiiuse.h copy ..\src\wiiuse.h ..\..\wiiusej\include\wiiuse.h
copy ..\src\wiiuse.h ..\..\Wiiscan\include\wiiuse.h copy ..\src\wiiuse.h ..\..\wiiscan\include\wiiuse.h
copy wiiuse.lib ..\..\WiiuseJ\lib\wiiuse.lib copy wiiuse.lib ..\..\wiiusej\lib\wiiuse.lib
copy wiiuse.lib ..\..\Wiiscan\lib\wiiuse.lib copy wiiuse.lib ..\..\wiiscan\lib\wiiuse.lib
copy wiiuse.dll ..\..\Mimis\wiiuse.dll copy wiiuse.dll ..\..\..\java\wiiusej\wiiuse.dll

BIN
cpp/wiiuse/Debug/wiiuse.dll
View File

Binary file not shown.

BIN
cpp/wiiuse/Debug/wiiuse.lib
View File

Binary file not shown.

10
cpp/wiiuse/Release/copy.bat
View File

@@ -1,5 +1,5 @@
copy ..\src\wiiuse.h ..\..\WiiuseJ\include\wiiuse.h copy ..\src\wiiuse.h ..\..\wiiusej\include\wiiuse.h
copy ..\src\wiiuse.h ..\..\Wiiscan\include\wiiuse.h copy ..\src\wiiuse.h ..\..\wiiscan\include\wiiuse.h
copy wiiuse.lib ..\..\WiiuseJ\lib\wiiuse.lib copy wiiuse.lib ..\..\wiiusej\lib\wiiuse.lib
copy wiiuse.lib ..\..\Wiiscan\lib\wiiuse.lib copy wiiuse.lib ..\..\wiiscan\lib\wiiuse.lib
copy wiiuse.dll ..\..\Mimis\wiiuse.dll copy wiiuse.dll ..\..\..\java\wiiusej\wiiuse.dll

BIN
cpp/wiiuse/Release/wiiuse.dll Normal file
View File

Binary file not shown.

BIN
cpp/wiipair/lib/wiiuse.lib → cpp/wiiuse/Release/wiiuse.lib
View File

Binary file not shown.

12
cpp/wiiusej/.cproject
View File

@@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?fileVersion 4.0.0?> <?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
<storageModule moduleId="org.eclipse.cdt.core.settings"> <storageModule moduleId="org.eclipse.cdt.core.settings">
<cconfiguration id="cdt.managedbuild.config.gnu.mingw.so.debug.1025362616"> <cconfiguration id="cdt.managedbuild.config.gnu.mingw.so.debug.1025362616">
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.so.debug.1025362616" moduleId="org.eclipse.cdt.core.settings" name="Debug"> <storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.so.debug.1025362616" moduleId="org.eclipse.cdt.core.settings" name="Debug">
@@ -65,8 +63,8 @@
<option id="gnu.cpp.link.option.libs.102697521" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs"> <option id="gnu.cpp.link.option.libs.102697521" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
<listOptionValue builtIn="false" value="wiiuse"/> <listOptionValue builtIn="false" value="wiiuse"/>
</option> </option>
<option id="gnu.cpp.link.option.flags.2098946116" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-Wl,--kill-at -static-libgcc" valueType="string"/> <option id="gnu.cpp.link.option.flags.2098946116" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-Wl,-add-stdcall-alias -static-libgcc -static-libstdc++" valueType="string"/>
<option id="gnu.cpp.link.option.strip.193866268" name="Omit all symbol information (-s)" superClass="gnu.cpp.link.option.strip" value="true" valueType="boolean"/> <option id="gnu.cpp.link.option.strip.193866268" name="Omit all symbol information (-s)" superClass="gnu.cpp.link.option.strip" value="false" valueType="boolean"/>
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1307869739" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input"> <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1307869739" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/> <additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@ -141,8 +139,8 @@
<option id="gnu.cpp.link.option.libs.173366246" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs"> <option id="gnu.cpp.link.option.libs.173366246" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
<listOptionValue builtIn="false" value="wiiuse"/> <listOptionValue builtIn="false" value="wiiuse"/>
</option> </option>
<option id="gnu.cpp.link.option.flags.1334245987" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-Wl,--kill-at -static-libgcc" valueType="string"/> <option id="gnu.cpp.link.option.flags.1334245987" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-Wl,-add-stdcall-alias -static-libgcc -static-libstdc++" valueType="string"/>
<option id="gnu.cpp.link.option.strip.611886908" name="Omit all symbol information (-s)" superClass="gnu.cpp.link.option.strip" value="true" valueType="boolean"/> <option id="gnu.cpp.link.option.strip.611886908" name="Omit all symbol information (-s)" superClass="gnu.cpp.link.option.strip" value="false" valueType="boolean"/>
<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.790138545" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input"> <inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.790138545" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/> <additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
<additionalInput kind="additionalinput" paths="$(LIBS)"/> <additionalInput kind="additionalinput" paths="$(LIBS)"/>

2
cpp/wiiusej/Debug/copy.bat
View File

@@ -1 +1 @@
copy wiiusej.dll ..\..\Mimis\wiiusej.dll copy wiiusej.dll ..\..\..\java\wiiusej\wiiusej.dll

BIN
cpp/wiiusej/Debug/wiiusej.dll
View File

Binary file not shown.

2
cpp/wiiusej/Release/copy.bat
View File

@@ -1 +1 @@
copy wiiusej.dll ..\..\Mimis\wiiusej.dll copy wiiusej.dll ..\..\..\java\wiiusej\wiiusej.dll

BIN
cpp/wiiusej/Release/wiiusej.dll
View File

Binary file not shown.

BIN
cpp/wiiusej/lib/wiiuse.lib
View File

Binary file not shown.

6
java/mimis/build.gradle
View File

@@ -18,4 +18,10 @@ jar {
manifest { manifest {
attributes 'Main-Class': mainClass attributes 'Main-Class': mainClass
} }
dependsOn configurations.runtime
from {
configurations.runtime.collect {
it.isDirectory() ? it : zipTree(it)
}
}
} }

BIN
java/mimis/mimis.dll
View File

Binary file not shown.

BIN
java/mimis/wiiuse.dll
View File

Binary file not shown.

BIN
java/mimis/wiiusej.dll
View File

Binary file not shown.

BIN
java/wiiusej/wiiuse.dll Normal file
View File

Binary file not shown.

BIN
java/wiiusej/wiiusej.dll Normal file
View File

Binary file not shown.

BIN
vendor/wiiscan/0.90/Debug/wiiuse.dll vendored
View File

Binary file not shown.

BIN
vendor/wiiscan/0.90/Lib/wiiuse.dll vendored
View File

Binary file not shown.

BIN
vendor/wiiscan/0.90/Lib/wiiuse.lib vendored
View File

Binary file not shown.

BIN
vendor/wiiscan/0.90/Release/wiiuse.dll vendored
View File

Binary file not shown.