Fix for MSVC

pull/1/head
Pascal Gauthier 10 years ago
parent 77f12fd001
commit 0f0d6d1b52
  1. 10
      Source/EngineMkI.h
  2. 4
      Source/EngineOpl.cpp
  3. 36
      Source/EngineOpl.h
  4. 2
      Source/msfa/controllers.h

@ -18,11 +18,11 @@
#ifndef ENGINEMKI_H_INCLUDED #ifndef ENGINEMKI_H_INCLUDED
#define ENGINEMKI_H_INCLUDED #define ENGINEMKI_H_INCLUDED
#include "synth.h" #include "msfa/synth.h"
#include "aligned_buf.h" #include "msfa/aligned_buf.h"
#include "fm_op_kernel.h" #include "msfa/fm_op_kernel.h"
#include "controllers.h" #include "msfa/controllers.h"
#include "fm_core.h" #include "msfa/fm_core.h"
class EngineMkI : public FmCore { class EngineMkI : public FmCore {

@ -25,7 +25,11 @@
#include "EngineOpl.h" #include "EngineOpl.h"
#ifdef _WIN32
__declspec(align(16)) int zeros[N] = {0};
#else
const int32_t __attribute__ ((aligned(16))) zeros[N] = {0}; const int32_t __attribute__ ((aligned(16))) zeros[N] = {0};
#endif
uint16_t SignBit = 0x8000; uint16_t SignBit = 0x8000;

@ -1,21 +1,31 @@
/* /**
============================================================================== *
* Copyright (c) 2014 Pascal Gauthier.
ExtraKernels.h *
Created: 20 Aug 2014 8:21:43pm * This program is free software; you can redistribute it and/or modify
Author: Pascal Gauthier * it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 3 of the License, or
============================================================================== * (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software Foundation,
* Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/ */
#ifndef ENGINEOPL_H_INCLUDED #ifndef ENGINEOPL_H_INCLUDED
#define ENGINEOPL_H_INCLUDED #define ENGINEOPL_H_INCLUDED
#include "synth.h" #include "msfa/synth.h"
#include "aligned_buf.h" #include "msfa/aligned_buf.h"
#include "fm_op_kernel.h" #include "msfa/fm_op_kernel.h"
#include "controllers.h" #include "msfa/controllers.h"
#include "fm_core.h" #include "msfa/fm_core.h"
class EngineOpl : public FmCore { class EngineOpl : public FmCore {

@ -17,6 +17,8 @@
#ifndef __CONTROLLERS_H #ifndef __CONTROLLERS_H
#define __CONTROLLERS_H #define __CONTROLLERS_H
#include "synth.h"
// State of MIDI controllers // State of MIDI controllers
const int kControllerModWheel = 1; const int kControllerModWheel = 1;
const int kControllerPitch = 128; const int kControllerPitch = 128;

Loading…
Cancel
Save