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

Merge branch 'develop' into develop-wiiusej

Browse Source 
Conflicts:
	cpp/wiiusej/Debug/wiiusej.dll
This commit is contained in:
Rik Veenboer
2013-07-20 16:38:32 +02:00
parent 6b083b2a51 0f7ae40ad0
commit 830db5ea9a
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.cproject
View File

@@ -13,7 +13,7 @@
<externalSetting> <externalSetting>
<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/WiiuseJ"/> <entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/WiiuseJ"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/WiiuseJ/Debug"/> <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/WiiuseJ/Debug"/>
<entry flags="RESOLVED" kind="libraryFile" name="wiiusej"/> <entry flags="RESOLVED" kind="libraryFile" name="wiiusej" srcPrefixMapping="" srcRootPath=""/>
</externalSetting> </externalSetting>
</externalSettings> </externalSettings>
<extensions> <extensions>
@@ -39,6 +39,7 @@
<option id="gnu.cpp.compiler.option.include.paths.716839450" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath"> <option id="gnu.cpp.compiler.option.include.paths.716839450" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${jdk}/include&quot;"/> <listOptionValue builtIn="false" value="&quot;${jdk}/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;${jdk}/include/win32&quot;"/> <listOptionValue builtIn="false" value="&quot;${jdk}/include/win32&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
</option> </option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.842669563" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/> <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.842669563" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool> </tool>
@@ -88,7 +89,7 @@
<externalSetting> <externalSetting>
<entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/WiiuseJ"/> <entry flags="VALUE_WORKSPACE_PATH" kind="includePath" name="/WiiuseJ"/>
<entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/WiiuseJ/Release"/> <entry flags="VALUE_WORKSPACE_PATH" kind="libraryPath" name="/WiiuseJ/Release"/>
<entry flags="RESOLVED" kind="libraryFile" name="wiiusej"/> <entry flags="RESOLVED" kind="libraryFile" name="wiiusej" srcPrefixMapping="" srcRootPath=""/>
</externalSetting> </externalSetting>
</externalSettings> </externalSettings>
<extensions> <extensions>
@@ -114,6 +115,7 @@
<option id="gnu.cpp.compiler.option.include.paths.1188267253" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath"> <option id="gnu.cpp.compiler.option.include.paths.1188267253" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
<listOptionValue builtIn="false" value="&quot;${jdk}/include&quot;"/> <listOptionValue builtIn="false" value="&quot;${jdk}/include&quot;"/>
<listOptionValue builtIn="false" value="&quot;${jdk}/include/win32&quot;"/> <listOptionValue builtIn="false" value="&quot;${jdk}/include/win32&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
</option> </option>
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1449486447" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/> <inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1449486447" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
</tool> </tool>
@@ -125,7 +127,7 @@
<listOptionValue builtIn="false" value="&quot;${jdk}/include/win32&quot;"/> <listOptionValue builtIn="false" value="&quot;${jdk}/include/win32&quot;"/>
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/> <listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/include}&quot;"/>
</option> </option>
<option id="gnu.c.compiler.option.preprocessor.def.symbols.227749697" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols" valueType="definedSymbols"/> <option id="gnu.c.compiler.option.preprocessor.def.symbols.227749697" name="Defined symbols (-D)" superClass="gnu.c.compiler.option.preprocessor.def.symbols"/>
<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.839631863" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.839631863" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
</tool> </tool>
<tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.so.release.901924366" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.so.release"> <tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.so.release.901924366" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.so.release">
@@ -173,4 +175,5 @@
</scannerConfigBuildInfo> </scannerConfigBuildInfo>
</storageModule> </storageModule>
<storageModule moduleId="refreshScope"/> <storageModule moduleId="refreshScope"/>
<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
</cproject> </cproject>

2
.project
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>WiiuseJ</name> <name>WiiuseJ library</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>

BIN
lib/wiiuse.lib
View File

Binary file not shown.