Visual C++ compilation

This commit is contained in:
Bertrand Songis
2013-12-02 21:13:42 +01:00
parent 2f8f2df3c7
commit b2db04f4bb
17 changed files with 37 additions and 69 deletions
+1 -1
View File
@@ -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"
+2 -2
View File
@@ -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
-6
View File
@@ -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>
@@ -6,7 +6,7 @@
;Include Modern UI
!include "MUI2.nsh"
!include "@CMAKE_CURRENT_SOURCE_DIR@\..\winbuild\FileAssociation.nsh"
!include "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\FileAssociation.nsh"
;--------------------------------
;General
@@ -41,7 +41,7 @@
;--------------------------------
;Pages
!insertmacro MUI_PAGE_LICENSE "@CMAKE_CURRENT_SOURCE_DIR@\..\winbuild\license.txt"
!insertmacro MUI_PAGE_LICENSE "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
@@ -80,7 +80,7 @@ Section "companion9x" SecDummy
SetOutPath "$INSTDIR"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\winbuild\license.txt"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
File "companion9x.exe"
File "C:\Programs\xerces\src\.libs\libxerces-c-3-1.dll"
File "C:\MinGW\bin\libgcc_s_dw2-1.dll"
@@ -91,10 +91,10 @@ Section "companion9x" SecDummy
File "@QT_BINARY_DIR@\QtXml4.dll"
File "@QT_BINARY_DIR@\QtNetwork4.dll"
File "@QT_BINARY_DIR@\Phonon4.dll"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\winbuild\avrdude.exe"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\winbuild\avrdude.conf"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\winbuild\libusb0.dll"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\winbuild\dfu-util.exe"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.exe"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.conf"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb0.dll"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\dfu-util.exe"
CreateDirectory "$INSTDIR\lang"
SetOutPath "$INSTDIR\lang"
@@ -6,7 +6,7 @@
;Include Modern UI
!include "MUI2.nsh"
!include "@CMAKE_CURRENT_SOURCE_DIR@\..\winbuild\FileAssociation.nsh"
!include "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\FileAssociation.nsh"
;--------------------------------
;General
@@ -60,7 +60,7 @@
;--------------------------------
;Pages
!insertmacro MUI_PAGE_LICENSE "@CMAKE_CURRENT_SOURCE_DIR@\..\winbuild\license.txt"
!insertmacro MUI_PAGE_LICENSE "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
!insertmacro MUI_PAGE_COMPONENTS
!insertmacro MUI_PAGE_DIRECTORY
@@ -99,7 +99,7 @@ Section "companion9x" SecDummy
SetOutPath "$INSTDIR"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\winbuild\license.txt"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\license.txt"
File "Release\companion9x.exe"
${!defineifexist} PTHREAD_WINDIR "C:\Programs\pthreads\Pre-built.2\lib\pthreadVC2.dll"
!ifdef PTHREAD_WINDIR
@@ -116,11 +116,11 @@ Section "companion9x" SecDummy
File "@QT_BINARY_DIR@\QtNetwork4.dll"
File "@QT_BINARY_DIR@\Phonon4.dll"
File "@QT_BINARY_DIR@\QtXml4.dll"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\winbuild\avrdude.exe"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\winbuild\avrdude.conf"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\winbuild\libusb0.dll"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\winbuild\dfu-util.exe"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\winbuild\libusb-1.0.dll"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.exe"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\avrdude.conf"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb0.dll"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\dfu-util.exe"
File "@CMAKE_CURRENT_SOURCE_DIR@\..\targets\windows\libusb-1.0.dll"
CreateDirectory "$INSTDIR\lang"
SetOutPath "$INSTDIR\lang"