Changeset 1358


Ignore:
Timestamp:
May 9, 2012, 6:40:56 PM (9 years ago)
Author:
sam
Message:

input: support Xbox input system for gamepads.

Location:
trunk
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/Makefile.am

    r1342 r1358  
    7171if HAVE_XBOX
    7272xbox_sources = \
    73     platform/xbox/xboxapp.cpp platform/xbox/xboxapp.h
     73    platform/xbox/xboxapp.cpp platform/xbox/xboxapp.h \
     74    platform/xbox/xboxinput.cpp platform/xbox/xboxinput.h
    7475endif
    7576
  • trunk/src/platform/xbox/xboxapp.cpp

    r1212 r1358  
    1818
    1919#include "core.h"
    20 #include "lolgl.h"
    2120#include "xboxapp.h"
     21#include "xboxinput.h"
    2222
    2323#if defined _XBOX
     
    5151    Ticker::Setup(fps);
    5252    Video::Setup(res);
     53
     54    /* Autoreleased objects */
     55    new XboxInput();
    5356#endif
    5457}
  • trunk/win32/lolcore.vcxproj

    r1342 r1358  
    112112    <ClCompile Include="..\src\platform\sdl\sdlinput.cpp" />
    113113    <ClCompile Include="..\src\platform\xbox\xboxapp.cpp" />
     114    <ClCompile Include="..\src\platform\xbox\xboxinput.cpp" />
    114115    <ClCompile Include="..\src\profiler.cpp" />
    115116    <ClCompile Include="..\src\sample.cpp" />
     
    170171    <ClInclude Include="..\src\platform\sdl\sdlinput.h" />
    171172    <ClInclude Include="..\src\platform\xbox\xboxapp.h" />
     173    <ClInclude Include="..\src\platform\xbox\xboxinput.h" />
    172174    <ClInclude Include="..\src\profiler.h" />
    173175    <ClInclude Include="..\src\sample.h" />
  • trunk/win32/lolcore.vcxproj.filters

    r1342 r1358  
    194194      <Filter>src\platform\xbox</Filter>
    195195    </ClCompile>
     196    <ClCompile Include="..\src\platform\xbox\xboxinput.cpp">
     197      <Filter>src\platform\xbox</Filter>
     198    </ClCompile>
    196199    <ClCompile Include="..\src\gpu\indexbuffer.cpp">
    197200      <Filter>src\gpu</Filter>
     
    367370      <Filter>src\platform\xbox</Filter>
    368371    </ClInclude>
     372    <ClInclude Include="..\src\platform\xbox\xboxinput.h">
     373      <Filter>src\platform\xbox</Filter>
     374    </ClInclude>
    369375    <ClInclude Include="..\src\gpu\indexbuffer.h">
    370376      <Filter>src\gpu</Filter>
  • trunk/win32/lolengine.sln

    r1242 r1358  
    260260                {80F81C11-8DA2-4990-91CB-9807783BA46E} = {E0491194-35E3-4513-9D31-608EA3165ECF}
    261261                {B92ABADC-45BE-4CC5-B724-9426053123A1} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
     262                {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
    262263                {6BF81B39-EDC2-4227-9992-C2D8ABEA95AF} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
    263                 {7B083DA2-FE08-4F6D-BFDD-195D5C2783EB} = {E74CF679-CA2A-47E9-B1F4-3779D6AC6B04}
    264264                {32F3F8CF-D22E-45E4-BEB8-AD909E8C5515} = {33704AA4-F2B5-4138-A40D-E3E77F89ED46}
    265265                {EE203B88-44CF-4859-9D42-7A5F40FECB52} = {8C77EAA8-1077-4EF7-AE53-97C6C60A3601}
Note: See TracChangeset for help on using the changeset viewer.