ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed Linux up to compile in codeblocks again. Added Onepad plugin project file. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1790 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-09-08 21:41:46 +00:00
parent eec90508ff
commit e03e8bff40
11 changed files with 2390 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/Linux/pcsx2-codeblocks.workspace
View File

@ -19,6 +19,7 @@
<Project filename="../../plugins/GSnull/Linux/GSnull.cbp" />
<Project filename="../../plugins/SPU2null/Linux/SPU2null.cbp" />
<Project filename="../../plugins/PadNull/Linux/PadNull.cbp" />
<Project filename="../../plugins/onepad/Linux/OnePad.cbp" />
<Project filename="../../tools/bin2cpp/bin2cpp.cbp" />
</Workspace>
</CodeBlocks_workspace_file>

17
pcsx2/Linux/pcsx2.cbp
View File

@ -36,6 +36,7 @@
<Option output="$(SvnRootDir)/bin/pcsx2-dev" prefix_auto="1" extension_auto="1" />
<Option working_dir="$(SvnRootDir)/bin/" />
<Option object_output="./.objs/devel" />
<Option external_deps="../../tools/bin/bin2cpp;" />
<Option type="0" />
<Option compiler="gcc" />
<Compiler>
@ -60,6 +61,7 @@
<Option output="$(SvnRootDir)/bin/pcsx2" prefix_auto="1" extension_auto="1" />
<Option working_dir="$(SvnRootDir)/bin/" />
<Option object_output="./.objs/release" />
<Option external_deps="../../tools/bin/bin2cpp;" />
<Option type="0" />
<Option compiler="gcc" />
<Compiler>
@ -302,10 +304,19 @@
<Unit filename="../gui/Panels/SpeedhacksPanel.cpp" />
<Unit filename="../gui/Panels/VideoPanel.cpp" />
<Unit filename="../gui/Plugins.cpp" />
<Unit filename="../gui/Resources/AppIcon.h" />
<Unit filename="../gui/Resources/AppIcon.png">
<Unit filename="../gui/Resources/AppIcon16.h" />
<Unit filename="../gui/Resources/AppIcon16.png">
<Option compile="1" />
<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
</Unit>
<Unit filename="../gui/Resources/AppIcon32.h" />
<Unit filename="../gui/Resources/AppIcon32.png">
<Option compile="1" />
<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
</Unit>
<Unit filename="../gui/Resources/AppIcon64.h" />
<Unit filename="../gui/Resources/AppIcon64.png">
<Option compile="1" />
<Option weight="0" />
<Option compiler="gcc" use="1" buildCommand="$(SvnRootDir)/tools/bin2app.sh $(SvnRootDir) $file" />
</Unit>
<Unit filename="../gui/Resources/BackgroundLogo.h" />

2
pcsx2/gui/Panels/GameFixesPanel.cpp
View File

@ -26,7 +26,7 @@ Panels::GameFixesPanel::GameFixesPanel( wxWindow& parent, int idealWidth ) :
wxStaticBoxSizer& groupSizer = *new wxStaticBoxSizer( wxVERTICAL, this, _("PCSX2 Gamefixes") );
// NOTE: Oder of checkboxes must match the order of the bits in the GamefixOptions structure!
// NOTE: Order of checkboxes must match the order of the bits in the GamefixOptions structure!
// NOTE2: Don't make this static, because translations can change at run-time :)

4
pcsx2/gui/Resources/rebuild.sh
View File

@ -1,7 +1,9 @@
#!/bin/sh
../../../tools/bin/bin2cpp BackgroundLogo.png
../../../tools/bin/bin2cpp AppIcon.png
../../../tools/bin/bin2cpp AppIcon16.png
../../../tools/bin/bin2cpp AppIcon32.png
../../../tools/bin/bin2cpp AppIcon64.png
../../../tools/bin/bin2cpp ConfigIcon_Cpu.png
../../../tools/bin/bin2cpp ConfigIcon_Paths.png

8
plugins/PadNull/Linux/PadNull.cbp
View File

@ -16,10 +16,6 @@
<Compiler>
<Add option="-g" />
</Compiler>
<Linker>
<Add option="`pkg-config gtk+-2.0 --libs`" />
<Add option="-shared" />
</Linker>
</Target>
<Target title="Release">
<Option output="../../../bin/plugins/libPadnull.so.0.1.0" prefix_auto="0" extension_auto="0" />
@ -45,6 +41,10 @@
<Add directory="../../PadNull" />
<Add directory="../../../common/include" />
</Compiler>
<Linker>
<Add option="`pkg-config gtk+-2.0 --libs`" />
<Add option="-shared" />
</Linker>
<Unit filename="Config.cpp" />
<Unit filename="Config.h" />
<Unit filename="PadLinux.cpp" />

80
plugins/onepad/Linux/OnePad.cbp Normal file
View File

@ -0,0 +1,80 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_project_file>
<FileVersion major="1" minor="6" />
<Project>
<Option title="OnePad" />
<Option pch_mode="2" />
<Option compiler="gcc" />
<Build>
<Target title="Debug">
<Option output="../../../bin/plugins/libOnePAD.so.0.1.0" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/Debug/" />
<Option type="3" />
<Option compiler="gcc" />
<Option createDefFile="1" />
<Option createStaticLib="1" />
<Compiler>
<Add option="-g" />
</Compiler>
</Target>
<Target title="Release">
<Option output="../../../bin/plugins/libOnePAD.so.0.1.0" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/Release/" />
<Option type="3" />
<Option compiler="gcc" />
<Option createDefFile="1" />
<Option createStaticLib="1" />
<Compiler>
<Add option="-O2" />
</Compiler>
<Linker>
<Add option="-s" />
</Linker>
</Target>
</Build>
<Compiler>
<Add option="-Wall" />
<Add option="`pkg-config gtk+-2.0 --cflags`" />
<Add option="`pkg-config sdl --cflags`" />
<Add option="-fPIC" />
<Add option="-m32" />
<Add directory="../Linux" />
<Add directory="../../onepad" />
<Add directory="../../../common/include" />
</Compiler>
<Linker>
<Add option="`pkg-config gtk+-2.0 --libs`" />
<Add option="`pkg-config sdl --libs`" />
<Add option="-shared" />
</Linker>
<Unit filename="callbacks.h" />
<Unit filename="gui.cpp" />
<Unit filename="ini.cpp" />
<Unit filename="interface.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="interface.h" />
<Unit filename="linux.cpp" />
<Unit filename="linux.h" />
<Unit filename="onepad.glade" />
<Unit filename="support.c">
<Option compilerVar="CC" />
</Unit>
<Unit filename="support.h" />
<Unit filename="../analog.cpp" />
<Unit filename="../analog.h" />
<Unit filename="../bitwise.h" />
<Unit filename="../controller.cpp" />
<Unit filename="../controller.h" />
<Unit filename="../joystick.cpp" />
<Unit filename="../joystick.h" />
<Unit filename="../keyboard.cpp" />
<Unit filename="../keyboard.h" />
<Unit filename="../onepad.cpp" />
<Unit filename="../onepad.h" />
<Extensions>
<code_completion />
<debugger />
</Extensions>
</Project>
</CodeBlocks_project_file>

2230
plugins/onepad/Linux/OnePad.depend Normal file
View File

File diff suppressed because it is too large Load Diff

2
plugins/onepad/Linux/interface.c
View File

@ -19,6 +19,8 @@
#include "interface.h"
#include "support.h"
#define VERSION 1
#define GLADE_HOOKUP_OBJECT(component,widget,name) \
g_object_set_data_full (G_OBJECT (component), name, \
gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref)

2
plugins/onepad/keyboard.cpp
View File

@ -27,7 +27,7 @@
#include "keyboard.h"
__forceinline int FindKey(int key, int pad)
int FindKey(int key, int pad)
{
for (int p = 0; p < MAX_SUB_KEYS; p++)
for (int i = 0; i < MAX_KEYS; i++)

2
plugins/onepad/keyboard.h
View File

@ -42,6 +42,6 @@ extern HWND GShwnd;
extern char* KeysymToChar(int keysym);
extern void PollForKeyboardInput(int pad);
extern void SetAutoRepeat(bool autorep);
extern __forceinline int FindKey(int key, int pad);
extern int FindKey(int key, int pad);
#endif