From 206a4a1831bf0250446be57f887dd2429b032a9e Mon Sep 17 00:00:00 2001 From: stephena Date: Sat, 12 Apr 2008 23:20:05 +0000 Subject: [PATCH] Fixed compilation in Win32 with Mingw. git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@1466 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba --- stella/src/win32/SerialPortWin32.cxx | 16 +--------- stella/src/win32/SerialPortWin32.hxx | 6 ++-- stella/src/win32/module.mk | 1 + stella/src/win32/stella.iss | 44 +++------------------------- 4 files changed, 10 insertions(+), 57 deletions(-) diff --git a/stella/src/win32/SerialPortWin32.cxx b/stella/src/win32/SerialPortWin32.cxx index 8809e71fe..a3e8913a6 100644 --- a/stella/src/win32/SerialPortWin32.cxx +++ b/stella/src/win32/SerialPortWin32.cxx @@ -13,7 +13,7 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: SerialPortWin32.cxx,v 1.2 2008-04-11 17:56:35 stephena Exp $ +// $Id: SerialPortWin32.cxx,v 1.3 2008-04-12 23:20:05 stephena Exp $ //============================================================================ #include @@ -37,11 +37,6 @@ bool SerialPortWin32::openPort(const string& device) { if(!myHandle) { - // - // Get Selected COM (or other if prefix has changed) port name from list box - // -// GetDlgItemText(IDC_CMB_PORTS, str); - myHandle = CreateFile(device.c_str(), GENERIC_READ|GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); @@ -60,16 +55,7 @@ bool SerialPortWin32::openPort(const string& device) dcb.ByteSize = 8; dcb.Parity = NOPARITY; dcb.StopBits = ONESTOPBIT; - // dcb.fOutxCtsFlow = TRUE; - // dcb.fRtsControl = RTS_CONTROL_HANDSHAKE; SetCommState(myHandle, &dcb); - -// cto.ReadIntervalTimeout = 0; -// cto.ReadTotalTimeoutMultiplier = 0; -// cto.ReadTotalTimeoutConstant = 0; -// cto.WriteTotalTimeoutMultiplier = 0; -// cto.WriteTotalTimeoutConstant = 0; -// SetCommTimeouts(myHandle, &cto); } else return false; diff --git a/stella/src/win32/SerialPortWin32.hxx b/stella/src/win32/SerialPortWin32.hxx index b7351d365..d76ae88ec 100644 --- a/stella/src/win32/SerialPortWin32.hxx +++ b/stella/src/win32/SerialPortWin32.hxx @@ -13,19 +13,21 @@ // See the file "license" for information on usage and redistribution of // this file, and for a DISCLAIMER OF ALL WARRANTIES. // -// $Id: SerialPortWin32.hxx,v 1.2 2008-04-11 17:56:35 stephena Exp $ +// $Id: SerialPortWin32.hxx,v 1.3 2008-04-12 23:20:05 stephena Exp $ //============================================================================ #ifndef SERIALPORT_WIN32_HXX #define SERIALPORT_WIN32_HXX +#include + #include "SerialPort.hxx" /** Implement reading and writing from a serial port under Windows systems. @author Stephen Anthony - @version $Id: SerialPortWin32.hxx,v 1.2 2008-04-11 17:56:35 stephena Exp $ + @version $Id: SerialPortWin32.hxx,v 1.3 2008-04-12 23:20:05 stephena Exp $ */ class SerialPortWin32 : public SerialPort { diff --git a/stella/src/win32/module.mk b/stella/src/win32/module.mk index ec8165026..b391f4566 100644 --- a/stella/src/win32/module.mk +++ b/stella/src/win32/module.mk @@ -3,6 +3,7 @@ MODULE := src/win32 MODULE_OBJS := \ src/win32/FSNodeWin32.o \ src/win32/OSystemWin32.o \ + src/win32/SerialPortWin32.o \ src/win32/SettingsWin32.o \ src/win32/stella_icon.o diff --git a/stella/src/win32/stella.iss b/stella/src/win32/stella.iss index 6afbc3674..da1724daf 100755 --- a/stella/src/win32/stella.iss +++ b/stella/src/win32/stella.iss @@ -1,74 +1,38 @@ ; Script generated by the Inno Setup Script Wizard. - ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! - - [Setup] - AppName=Stella - AppVerName=Stella 2.5.1 - AppPublisher=Bradford W. Mott and the Stella team - AppPublisherURL=http://stella.sourceforge.net - AppSupportURL=http://stella.sourceforge.net - AppUpdatesURL=http://stella.sourceforge.net - DefaultDirName={pf}\Stella - DefaultGroupName=Stella - OutputBaseFilename=stella-2.5.1-win32 - Compression=lzma - SolidCompression=yes - - [Languages] - Name: "eng"; MessagesFile: "compiler:Default.isl" - - [Tasks] - Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked - - [Files] - -Source: "C:\Users\stephena\src\stella\stella-2.5.1\Stella.exe"; DestDir: "{app}"; Flags: ignoreversion - -Source: "C:\Users\stephena\src\stella\stella-2.5.1\zlibwapi.dll"; DestDir: "{app}"; Flags: ignoreversion - -Source: "C:\Users\stephena\src\stella\stella-2.5.1\SDL.dll"; DestDir: "{app}"; Flags: ignoreversion - -Source: "C:\Users\stephena\src\stella\stella-2.5.1\docs\*"; DestDir: "{app}\docs"; Flags: ignoreversion recursesubdirs createallsubdirs - +Source: "..\..\stella-2.5.1\Stella.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\stella-2.5.1\zlib1.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\stella-2.5.1\SDL.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\..\stella-2.5.1\docs\*"; DestDir: "{app}\docs"; Flags: ignoreversion recursesubdirs createallsubdirs ; NOTE: Don't use "Flags: ignoreversion" on any shared system files - - [Icons] - Name: "{group}\Stella"; Filename: "{app}\stella.exe"; WorkingDir: "{app}" - Name: "{userdesktop}\Stella"; Filename: "{app}\stella.exe"; WorkingDir: "{app}"; Tasks: desktopicon - Name: "{group}\Documentation"; Filename: "{app}\docs\index.html" - Name: "{group}\Uninstall Stella"; Filename: "{uninstallexe}" - - ;[Run] - ;Filename: "{app}\stella.exe"; Description: "{cm:LaunchProgram,Stella}"; Flags: nowait postinstall skipifsilent