Bring us closer to working with MinGW again.

The biggest obstacle right now deals with FFMPEG. I insist on being able to utilize the git clone/submodule (5_1_0) section. I'm just struggling with the commands.

As part of this commit, some linux files are restored in the compilation chain. This is for consistency with the old Makefile approach.

Assistance will be needed at this point to complete MinGW support.
This commit is contained in:
Jason Felds
2015-09-27 17:07:15 -04:00
parent 5fd90b7502
commit b3a5a82b5c
6 changed files with 139 additions and 76 deletions
+20
View File
@@ -274,6 +274,16 @@ if(NOT APPLE)
list(APPEND SMDATA_ARCH_LIGHTS_HPP
"arch/Lights/LightsDriver_Export.h"
)
if(NOT MSVC)
list(APPEND SMDATA_ARCH_LIGHTS_SRC
"arch/Lights/LightsDriver_SextetStream.cpp"
)
list(APPEND SMDATA_ARCH_LIGHTS_SRC
"arch/Lights/LightsDriver_SextetStream.h"
)
endif()
if(WIN32)
list(APPEND SMDATA_ARCH_LIGHTS_SRC
"arch/Lights/LightsDriver_Win32Parallel.cpp"
@@ -341,6 +351,14 @@ if(WIN32)
"arch/InputHandler/InputHandler_Win32_Para.h"
"arch/InputHandler/InputHandler_Win32_Pump.h"
)
if (NOT MSVC)
list(APPEND SMDATA_ARCH_INPUT_SRC
"arch/InputHandler/InputHandler_SextetStream.cpp"
)
list(APPEND SMDATA_ARCH_INPUT_HPP
"arch/InputHandler/InputHandler_SextetStream.h"
)
endif()
elseif(APPLE)
list(APPEND SMDATA_ARCH_INPUT_SRC
"arch/InputHandler/InputHandler_MacOSX_HID.cpp"
@@ -355,12 +373,14 @@ else() # Unix/Linux
"arch/InputHandler/InputHandler_Linux_Joystick.cpp"
"arch/InputHandler/InputHandler_Linux_Event.cpp"
"arch/InputHandler/InputHandler_Linux_PIUIO.cpp"
"arch/InputHandler/InputHandler_SextetStream.cpp"
)
list(APPEND SMDATA_ARCH_INPUT_SRC
"arch/InputHandler/LinuxInputManager.h"
"arch/InputHandler/InputHandler_Linux_Joystick.h"
"arch/InputHandler/InputHandler_Linux_Event.h"
"arch/InputHandler/InputHandler_Linux_PIUIO.h"
"arch/InputHandler/InputHandler_SextetStream.h"
)
if(WITH_TTY)
list(APPEND SMDATA_ARCH_INPUT_SRC
@@ -22,7 +22,9 @@ InputHandler_Win32_Pump::InputHandler_Win32_Pump()
m_pDevice = new USBDevice[NUM_PUMPS];
int iNumFound = 0;
for( int p = 0; p < ARRAYSIZE(pump_usb_pids); ++p )
// TODO: Use C++1x semantics to loop through the pids.
// Hardcoding for now to keep this moving.
for( int p = 0; p < 2; ++p )
{
const int pump_usb_pid = pump_usb_pids[p];
for( int i = 0; i < NUM_PUMPS; ++i )
+2
View File
@@ -89,8 +89,10 @@ struct tm *my_localtime_r( const time_t *timep, struct tm *result );
#define localtime_r my_localtime_r
struct tm *my_gmtime_r( const time_t *timep, struct tm *result );
#define gmtime_r my_gmtime_r
#if defined(_MSC_VER)
void my_usleep( unsigned long usec );
#define usleep my_usleep
#endif
// Missing stdint types:
#if !defined(__MINGW32__) // MinGW headers define these for us
+18
View File
@@ -126,6 +126,24 @@ typedef long ssize_t;
/* Defined to 1 if compiling with OGG support. */
#cmakedefine HAS_OGG 1
/* Defined to 1 if building on a windows system, and thus uses the windows loading window. */
#cmakedefine NEED_WINDOWS_LOADING_WINDOW 1
/* Defined to 1 if the PBS_MARQUEE symbol was found. */
#cmakedefine HAVE_PBS_MARQUEE 1
/* Defined to 1 if the PBM_SETMARQUEE symbol was found. */
#cmakedefine HAVE_PBM_SETMARQUEE 1
#if defined(NEED_WINDOWS_LOADING_WINDOW)
#if !defined(HAVE_PBS_MARQUEE)
#define PBS_MARQUEE 0x08
#endif
#if !defined(HAVE_PBM_SETMARQUEE)
#define PBM_SETMARQUEE (WM_USER+10)
#endif
#endif
#if defined(__GNUC__)
/** @brief Define a macro to tell the compiler that a function has printf()
* semantics, to aid warning output. */