Visual C++ compilation
This commit is contained in:
@@ -335,7 +335,7 @@ IF( WIN32 )
|
||||
ENDIF( )
|
||||
|
||||
SET( SYSDIR "$ENV{windir}/system32" )
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../winbuild/${NSI_IN_FILE} ${CMAKE_CURRENT_BINARY_DIR}/companion9x.nsi @ONLY)
|
||||
CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/../targets/windows/${NSI_IN_FILE} ${CMAKE_CURRENT_BINARY_DIR}/companion9x.nsi @ONLY)
|
||||
|
||||
FIND_PROGRAM(NSIS_EXE makensis.exe PATHS
|
||||
"C:/Program Files/NSIS"
|
||||
|
||||
@@ -26,9 +26,9 @@
|
||||
#include <iostream>
|
||||
|
||||
#if __GNUC__
|
||||
#define PACK( __Declaration__ ) __Declaration__ __attribute__((__packed__))
|
||||
#define PACK( __Declaration__ ) __Declaration__ __attribute__((__packed__))
|
||||
#else
|
||||
#include "../winbuild/winbuild.h"
|
||||
#include "../targets/windows/winbuild.h"
|
||||
#endif
|
||||
|
||||
#define EESIZE_STOCK 2048
|
||||
|
||||
@@ -18,12 +18,6 @@
|
||||
#ifndef file_h
|
||||
#define file_h
|
||||
|
||||
#if __GNUC__
|
||||
#define PACK( __Declaration__ ) __Declaration__ __attribute__((__packed__))
|
||||
#else
|
||||
#include "../winbuild/winbuild.h"
|
||||
#endif
|
||||
|
||||
#include "eeprominterface.h"
|
||||
|
||||
#define ERR_NONE 0
|
||||
|
||||
@@ -27,10 +27,6 @@
|
||||
#define NUM_POTS 3
|
||||
#define SWSRC_SW1 DSW_SW1
|
||||
|
||||
#ifndef __GNUC__
|
||||
#include "../winbuild/winbuild.h"
|
||||
#endif
|
||||
|
||||
#include <exception>
|
||||
|
||||
namespace Er9x {
|
||||
|
||||
@@ -37,10 +37,6 @@
|
||||
#undef min
|
||||
#undef max
|
||||
|
||||
#ifndef __GNUC__
|
||||
#include "../winbuild/winbuild.h"
|
||||
#endif
|
||||
|
||||
#include <exception>
|
||||
|
||||
namespace Ersky9x {
|
||||
|
||||
@@ -53,10 +53,6 @@
|
||||
#undef min
|
||||
#undef max
|
||||
|
||||
#ifndef __GNUC__
|
||||
#include "../winbuild/winbuild.h"
|
||||
#endif
|
||||
|
||||
#include <exception>
|
||||
|
||||
namespace Open9xGruvin9x {
|
||||
|
||||
@@ -52,10 +52,6 @@
|
||||
#undef min
|
||||
#undef max
|
||||
|
||||
#ifndef __GNUC__
|
||||
#include "../winbuild/winbuild.h"
|
||||
#endif
|
||||
|
||||
#include <exception>
|
||||
|
||||
namespace Open9xM128 {
|
||||
|
||||
@@ -58,10 +58,6 @@
|
||||
#undef min
|
||||
#undef max
|
||||
|
||||
#ifndef __GNUC__
|
||||
#include "../winbuild/winbuild.h"
|
||||
#endif
|
||||
|
||||
#include <exception>
|
||||
|
||||
namespace Open9xSky9x {
|
||||
|
||||
@@ -56,10 +56,6 @@
|
||||
#undef min
|
||||
#undef max
|
||||
|
||||
#ifndef __GNUC__
|
||||
#include "../winbuild/winbuild.h"
|
||||
#endif
|
||||
|
||||
#include <exception>
|
||||
|
||||
namespace Open9x {
|
||||
|
||||
@@ -52,10 +52,6 @@
|
||||
#undef min
|
||||
#undef max
|
||||
|
||||
#ifndef __GNUC__
|
||||
#include "../winbuild/winbuild.h"
|
||||
#endif
|
||||
|
||||
#include <exception>
|
||||
|
||||
namespace Open9xX9D {
|
||||
|
||||
@@ -28,10 +28,6 @@
|
||||
#define NUM_CSW 12
|
||||
#define SWSRC_SW1 10
|
||||
|
||||
#ifndef __GNUC__
|
||||
#include "../winbuild/winbuild.h"
|
||||
#endif
|
||||
|
||||
#include <exception>
|
||||
#include <algorithm>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user