ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Renamed 'Win32' in various locations as 'Windows', to be more 

in line with the other ports.  Besides, the code now also supports
64-bit Windows, so the name was incorrect anyway.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2830 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
This commit is contained in:
stephena 2013-09-27 20:41:24 +00:00
parent a911a5b368
commit 01f7c2c2f3
28 changed files with 143 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -213,8 +213,8 @@ uninstall:
src/emucore/M6502.ins: src/emucore/M6502.m4 src/emucore/M6502.ins: src/emucore/M6502.m4
m4 src/emucore/M6502.m4 > src/emucore/M6502.ins m4 src/emucore/M6502.m4 > src/emucore/M6502.ins
# Special rule for Win32 icon stuff (there's probably a better way to do this ...) # Special rule for windows icon stuff (there's probably a better way to do this ...)
src/win32/stella_icon.o: src/win32/stella.ico src/win32/stella.rc src/windows/stella_icon.o: src/windows/stella.ico src/windows/stella.rc
$(WINDRES) --include-dir src/win32 src/win32/stella.rc src/win32/stella_icon.o $(WINDRES) --include-dir src/windows src/windows/stella.rc src/windows/stella_icon.o
.PHONY: deb bundle test install uninstall .PHONY: deb bundle test install uninstall

28
configure vendored
View File

@ -42,7 +42,7 @@ _rm="rm -f"
_rm_rec="$_rm -r" _rm_rec="$_rm -r"
_zip="zip -q" _zip="zip -q"
_cp=cp _cp=cp
_win32path="" _windowspath=""
_windres=windres _windres=windres
_sdlconfig=sdl-config _sdlconfig=sdl-config
_sdlpath="$PATH" _sdlpath="$PATH"
@ -517,14 +517,8 @@ if test -n "$_host"; then
# CXXFLAGS="$CFLAGS -newlib -mstrict-align -mcpu=750 -mtune=7400" # CXXFLAGS="$CFLAGS -newlib -mstrict-align -mcpu=750 -mtune=7400"
# LDFLAGS="$LDFLAGS -newlib" # LDFLAGS="$LDFLAGS -newlib"
# ;; # ;;
gp2x)
echo "Cross-compiling to $_host, forcing static build, and disabling OpenGL."
_build_static=yes
_build_gl=no
_build_windowed=no
;;
mingw32-cross) mingw32-cross)
echo "Cross-compiling for Win32 using MinGW." echo "Cross-compiling for Windows using MinGW."
DEFINES="$DEFINES -DWIN32" DEFINES="$DEFINES -DWIN32"
_host_os=win32 _host_os=win32
;; ;;
@ -781,21 +775,11 @@ EOF
fi fi
;; ;;
win32) win32)
DEFINES="$DEFINES -DBSPF_WIN32 -DHAVE_GETTIMEOFDAY -DHAVE_INTTYPES" DEFINES="$DEFINES -DBSPF_WINDOWS -DHAVE_GETTIMEOFDAY -DHAVE_INTTYPES"
MODULES="$MODULES $SRC/win32" MODULES="$MODULES $SRC/windows"
INCLUDES="$INCLUDES -I$SRC/win32" INCLUDES="$INCLUDES -I$SRC/windows"
LIBS="$LIBS -lmingw32 -lwinmm" LIBS="$LIBS -lmingw32 -lwinmm"
;; ;;
gp2x)
# -O3 hangs the GP2X, do not use.
CXXFLAGS="-O2 -finline-functions -mtune=arm920t"
DEFINES="$DEFINES -DBSPF_GP2X -DGP2X -DHAVE_GETTIMEOFDAY -DHAVE_INTTYPES"
MODULES="$MODULES $SRC/gp2x"
INCLUDES="$INCLUDES -I$SRC/gp2x $ZLIB_CFLAGS"
_ranlib="arm-linux-ranlib"
_ar="arm-linux-ar cru"
;;
*) *)
echo "WARNING: host system not currenty supported" echo "WARNING: host system not currenty supported"
exit exit
@ -875,7 +859,7 @@ RM := $_rm
RM_REC := $_rm_rec RM_REC := $_rm_rec
ZIP := $_zip ZIP := $_zip
CP := $_cp CP := $_cp
WIN32PATH=$_win32path WINDOWSPATH=$_windowspath
STRIP := $_strip STRIP := $_strip
WINDRES := $_windres WINDRES := $_windres

12
src/common/FSNodeFactory.hxx
View File

@ -21,10 +21,10 @@
#define FSNODE_FACTORY_HXX #define FSNODE_FACTORY_HXX
class AbstractFSNode; class AbstractFSNode;
#if defined(UNIX) || defined(MAC_OSX) #if defined(BSPF_UNIX) || defined(BSPF_MAC_OSX)
#include "FSNodePOSIX.hxx" #include "FSNodePOSIX.hxx"
#elif defined(WIN32) #elif defined(BSPF_WINDOWS)
#include "FSNodeWin32.hxx" #include "FSNodeWINDOWS.hxx"
#else #else
#error Unsupported platform in FSNodeFactory! #error Unsupported platform in FSNodeFactory!
#endif #endif
@ -47,10 +47,10 @@ class FilesystemNodeFactory
switch(type) switch(type)
{ {
case SYSTEM: case SYSTEM:
#if defined(UNIX) || defined(MAC_OSX) #if defined(BSPF_UNIX) || defined(BSPF_MAC_OSX)
return new FilesystemNodePOSIX(path); return new FilesystemNodePOSIX(path);
#elif defined(WIN32) #elif defined(BSPF_WINDOWS)
return new FilesystemNodeWin32(path); return new FilesystemNodeWINDOWS(path);
#endif #endif
break; break;
case ZIP: case ZIP:

14
src/common/bspf.hxx
View File

@ -43,7 +43,7 @@
// Types for 64-bit signed and unsigned integers // Types for 64-bit signed and unsigned integers
typedef int64_t Int64; typedef int64_t Int64;
typedef uint64_t uInt64; typedef uint64_t uInt64;
#elif defined BSPF_WIN32 #elif defined BSPF_WINDOWS
// Types for 8-bit signed and unsigned integers // Types for 8-bit signed and unsigned integers
typedef signed char Int8; typedef signed char Int8;
typedef unsigned char uInt8; typedef unsigned char uInt8;
@ -76,7 +76,7 @@ using namespace std;
// Defines to help with path handling // Defines to help with path handling
#if (defined(BSPF_UNIX) || defined(BSPF_MAC_OSX)) #if (defined(BSPF_UNIX) || defined(BSPF_MAC_OSX))
#define BSPF_PATH_SEPARATOR "/" #define BSPF_PATH_SEPARATOR "/"
#elif (defined(BSPF_DOS) || defined(BSPF_WIN32) || defined(BSPF_OS2)) #elif (defined(BSPF_DOS) || defined(BSPF_WINDOWS) || defined(BSPF_OS2))
#define BSPF_PATH_SEPARATOR "\\" #define BSPF_PATH_SEPARATOR "\\"
#else #else
#error Update src/common/bspf.hxx for path separator #error Update src/common/bspf.hxx for path separator
@ -95,7 +95,7 @@ using namespace std;
#endif #endif
// I wish Windows had a complete POSIX layer // I wish Windows had a complete POSIX layer
#if defined BSPF_WIN32 && !defined __GNUG__ #if defined BSPF_WINDOWS && !defined __GNUG__
#define BSPF_snprintf _snprintf #define BSPF_snprintf _snprintf
#define BSPF_vsnprintf _vsnprintf #define BSPF_vsnprintf _vsnprintf
#else #else
@ -125,7 +125,7 @@ static bool BSPF_equalsIgnoreCaseChar(char ch1, char ch2)
// Compare two strings, ignoring case // Compare two strings, ignoring case
inline int BSPF_compareIgnoreCase(const string& s1, const string& s2) inline int BSPF_compareIgnoreCase(const string& s1, const string& s2)
{ {
#if defined WIN32 && !defined __GNUG__ #if defined WINDOWS && !defined __GNUG__
return _stricmp(s1.c_str(), s2.c_str()); return _stricmp(s1.c_str(), s2.c_str());
#else #else
return strcasecmp(s1.c_str(), s2.c_str()); return strcasecmp(s1.c_str(), s2.c_str());
@ -133,7 +133,7 @@ inline int BSPF_compareIgnoreCase(const string& s1, const string& s2)
} }
inline int BSPF_compareIgnoreCase(const char* s1, const char* s2) inline int BSPF_compareIgnoreCase(const char* s1, const char* s2)
{ {
#if defined WIN32 && !defined __GNUG__ #if defined WINDOWS && !defined __GNUG__
return _stricmp(s1, s2); return _stricmp(s1, s2);
#else #else
return strcasecmp(s1, s2); return strcasecmp(s1, s2);
@ -143,7 +143,7 @@ inline int BSPF_compareIgnoreCase(const char* s1, const char* s2)
// Test whether the first string starts with the second one (case insensitive) // Test whether the first string starts with the second one (case insensitive)
inline bool BSPF_startsWithIgnoreCase(const string& s1, const string& s2) inline bool BSPF_startsWithIgnoreCase(const string& s1, const string& s2)
{ {
#if defined WIN32 && !defined __GNUG__ #if defined WINDOWS && !defined __GNUG__
return _strnicmp(s1.c_str(), s2.c_str(), s2.length()) == 0; return _strnicmp(s1.c_str(), s2.c_str(), s2.length()) == 0;
#else #else
return strncasecmp(s1.c_str(), s2.c_str(), s2.length()) == 0; return strncasecmp(s1.c_str(), s2.c_str(), s2.length()) == 0;
@ -151,7 +151,7 @@ inline bool BSPF_startsWithIgnoreCase(const string& s1, const string& s2)
} }
inline bool BSPF_startsWithIgnoreCase(const char* s1, const char* s2) inline bool BSPF_startsWithIgnoreCase(const char* s1, const char* s2)
{ {
#if defined WIN32 && !defined __GNUG__ #if defined WINDOWS && !defined __GNUG__
return _strnicmp(s1, s2, strlen(s2)) == 0; return _strnicmp(s1, s2, strlen(s2)) == 0;
#else #else
return strncasecmp(s1, s2, strlen(s2)) == 0; return strncasecmp(s1, s2, strlen(s2)) == 0;

18
src/common/mainSDL.cxx
View File

@ -32,13 +32,13 @@
#include "OSystem.hxx" #include "OSystem.hxx"
#include "System.hxx" #include "System.hxx"
#if defined(UNIX) #if defined(BSPF_UNIX)
#include "SettingsUNIX.hxx" #include "SettingsUNIX.hxx"
#include "OSystemUNIX.hxx" #include "OSystemUNIX.hxx"
#elif defined(WIN32) #elif defined(BSPF_WINDOWS)
#include "SettingsWin32.hxx" #include "SettingsWINDOWS.hxx"
#include "OSystemWin32.hxx" #include "OSystemWINDOWS.hxx"
#elif defined(MAC_OSX) #elif defined(BSPF_MAC_OSX)
#include "SettingsMACOSX.hxx" #include "SettingsMACOSX.hxx"
#include "OSystemMACOSX.hxx" #include "OSystemMACOSX.hxx"
extern "C" { extern "C" {
@ -85,12 +85,12 @@ int main(int argc, char* argv[])
ios_base::sync_with_stdio(false); ios_base::sync_with_stdio(false);
// Create the parent OSystem object and settings // Create the parent OSystem object and settings
#if defined(UNIX) #if defined(BSPF_UNIX)
theOSystem = new OSystemUNIX(); theOSystem = new OSystemUNIX();
SettingsUNIX settings(theOSystem); SettingsUNIX settings(theOSystem);
#elif defined(WIN32) #elif defined(BSPF_WINDOWS)
theOSystem = new OSystemWin32(); theOSystem = new OSystemWINDOWS();
SettingsWin32 settings(theOSystem); SettingsWINDOWS settings(theOSystem);
#elif defined(MAC_OSX) #elif defined(MAC_OSX)
theOSystem = new OSystemMACOSX(); theOSystem = new OSystemMACOSX();
SettingsMACOSX settings(theOSystem); SettingsMACOSX settings(theOSystem);

16
src/emucore/OSystem.cxx
View File

@ -40,11 +40,11 @@
#endif #endif
#include "SerialPort.hxx" #include "SerialPort.hxx"
#if defined(UNIX) #if defined(BSPF_UNIX)
#include "SerialPortUNIX.hxx" #include "SerialPortUNIX.hxx"
#elif defined(WIN32) #elif defined(BSPF_WINDOWS)
#include "SerialPortWin32.hxx" #include "SerialPortWINDOWS.hxx"
#elif defined(MAC_OSX) #elif defined(BSPF_MAC_OSX)
#include "SerialPortMACOSX.hxx" #include "SerialPortMACOSX.hxx"
#endif #endif
@ -251,11 +251,11 @@ bool OSystem::create()
// Create the serial port object // Create the serial port object
// This is used by any controller that wants to directly access // This is used by any controller that wants to directly access
// a real serial port on the system // a real serial port on the system
#if defined(UNIX) #if defined(BSPF_UNIX)
mySerialPort = new SerialPortUNIX(); mySerialPort = new SerialPortUNIX();
#elif defined(WIN32) #elif defined(BSPF_WINDOWS)
mySerialPort = new SerialPortWin32(); mySerialPort = new SerialPortWINDOWS();
#elif defined(MAC_OSX) #elif defined(BSPF_MAC_OSX)
mySerialPort = new SerialPortMACOSX(); mySerialPort = new SerialPortMACOSX();
#else #else
// Create an 'empty' serial port // Create an 'empty' serial port

2
src/gui/AboutDialog.cxx
View File

@ -128,7 +128,7 @@ void AboutDialog::updateStrings(int page, int lines, string& title)
ADD_ATEXT("\\L\\c0"" Bradford W. Mott"); ADD_ATEXT("\\L\\c0"" Bradford W. Mott");
ADD_ATEXT("\\L\\c2"" Original author"); ADD_ATEXT("\\L\\c2"" Original author");
ADD_ATEXT("\\L\\c0"" Stephen Anthony"); ADD_ATEXT("\\L\\c0"" Stephen Anthony");
ADD_ATEXT("\\L\\c2"" Lead developer, Linux/MacOS X/Win32 maintainer"); ADD_ATEXT("\\L\\c2"" Lead developer, Linux/MacOS X/Windows maintainer");
ADD_ATEXT("\\L\\c0"" Eckhard Stolberg"); ADD_ATEXT("\\L\\c0"" Eckhard Stolberg");
ADD_ATEXT("\\L\\c2"" Emulation core development"); ADD_ATEXT("\\L\\c2"" Emulation core development");
ADD_ATEXT("\\L\\c0"" Brian Watson"); ADD_ATEXT("\\L\\c0"" Brian Watson");

2
src/gui/VideoDialog.cxx
View File

@ -383,7 +383,7 @@ VideoDialog::VideoDialog(OSystem* osystem, DialogContainer* parent,
myFullscreenCheckbox->clearFlags(WIDGET_ENABLED); myFullscreenCheckbox->clearFlags(WIDGET_ENABLED);
myCenterCheckbox->clearFlags(WIDGET_ENABLED); myCenterCheckbox->clearFlags(WIDGET_ENABLED);
#endif #endif
#if !(defined(BSPF_WIN32) || (defined(BSPF_UNIX) && defined(HAVE_X11))) #if !(defined(BSPF_WINDOWS) || (defined(BSPF_UNIX) && defined(HAVE_X11)))
myCenterCheckbox->clearFlags(WIDGET_ENABLED); myCenterCheckbox->clearFlags(WIDGET_ENABLED);
#endif #endif
} }

14
src/win32/module.mk
View File

@ -1,14 +0,0 @@
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
MODULE_DIRS += \
src/win32
# Include common rules
include $(srcdir)/common.rules

0
src/win32/Create_Builds.bat → src/windows/Create_Builds.bat
View File

54
src/win32/FSNodeWin32.cxx → src/windows/FSNodeWINDOWS.cxx
View File

@ -23,20 +23,12 @@
#ifdef ARRAYSIZE #ifdef ARRAYSIZE
#undef ARRAYSIZE #undef ARRAYSIZE
#endif #endif
#ifdef _WIN32_WCE
#include <windows.h>
// winnt.h defines ARRAYSIZE, but we want our own one...
#undef ARRAYSIZE
#undef GetCurrentDirectory
#endif
#include <io.h> #include <io.h>
#include <stdio.h> #include <stdio.h>
#ifndef _WIN32_WCE #include <windows.h>
#include <windows.h> // winnt.h defines ARRAYSIZE, but we want our own one...
// winnt.h defines ARRAYSIZE, but we want our own one... #undef ARRAYSIZE
#undef ARRAYSIZE
#endif
// F_OK, R_OK and W_OK are not defined under MSVC, so we define them here // F_OK, R_OK and W_OK are not defined under MSVC, so we define them here
// For more information on the modes used by MSVC, check: // For more information on the modes used by MSVC, check:
@ -53,7 +45,7 @@
#define W_OK 2 #define W_OK 2
#endif #endif
#include "FSNodeWin32.hxx" #include "FSNodeWINDOWS.hxx"
/** /**
* Returns the last component of a given path. * Returns the last component of a given path.
@ -81,25 +73,25 @@ const char* lastPathComponent(const string& str)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool FilesystemNodeWin32::exists() const bool FilesystemNodeWINDOWS::exists() const
{ {
return _access(_path.c_str(), F_OK) == 0; return _access(_path.c_str(), F_OK) == 0;
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool FilesystemNodeWin32::isReadable() const bool FilesystemNodeWINDOWS::isReadable() const
{ {
return _access(_path.c_str(), R_OK) == 0; return _access(_path.c_str(), R_OK) == 0;
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool FilesystemNodeWin32::isWritable() const bool FilesystemNodeWINDOWS::isWritable() const
{ {
return _access(_path.c_str(), W_OK) == 0; return _access(_path.c_str(), W_OK) == 0;
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void FilesystemNodeWin32::setFlags() void FilesystemNodeWINDOWS::setFlags()
{ {
// Get absolute path // Get absolute path
TCHAR buf[4096]; TCHAR buf[4096];
@ -129,10 +121,10 @@ void FilesystemNodeWin32::setFlags()
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void FilesystemNodeWin32::addFile(AbstractFSList& list, ListMode mode, void FilesystemNodeWINDOWS::addFile(AbstractFSList& list, ListMode mode,
const char* base, WIN32_FIND_DATA* find_data) const char* base, WIN32_FIND_DATA* find_data)
{ {
FilesystemNodeWin32 entry; FilesystemNodeWINDOWS entry;
char* asciiName = toAscii(find_data->cFileName); char* asciiName = toAscii(find_data->cFileName);
bool isDirectory, isFile; bool isDirectory, isFile;
@ -157,11 +149,11 @@ void FilesystemNodeWin32::addFile(AbstractFSList& list, ListMode mode,
entry._isValid = true; entry._isValid = true;
entry._isPseudoRoot = false; entry._isPseudoRoot = false;
list.push_back(new FilesystemNodeWin32(entry)); list.push_back(new FilesystemNodeWINDOWS(entry));
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
char* FilesystemNodeWin32::toAscii(TCHAR* str) char* FilesystemNodeWINDOWS::toAscii(TCHAR* str)
{ {
#ifndef UNICODE #ifndef UNICODE
return (char*)str; return (char*)str;
@ -173,7 +165,7 @@ char* FilesystemNodeWin32::toAscii(TCHAR* str)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
const TCHAR* FilesystemNodeWin32::toUnicode(const char* str) const TCHAR* FilesystemNodeWINDOWS::toUnicode(const char* str)
{ {
#ifndef UNICODE #ifndef UNICODE
return (const TCHAR *)str; return (const TCHAR *)str;
@ -185,7 +177,7 @@ const TCHAR* FilesystemNodeWin32::toUnicode(const char* str)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
FilesystemNodeWin32::FilesystemNodeWin32() FilesystemNodeWINDOWS::FilesystemNodeWINDOWS()
{ {
// Create a virtual root directory for standard Windows system // Create a virtual root directory for standard Windows system
_isDirectory = true; _isDirectory = true;
@ -196,7 +188,7 @@ FilesystemNodeWin32::FilesystemNodeWin32()
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
FilesystemNodeWin32::FilesystemNodeWin32(const string& p) FilesystemNodeWINDOWS::FilesystemNodeWINDOWS(const string& p)
{ {
// Default to home directory // Default to home directory
_path = p.length() > 0 ? p : "~"; _path = p.length() > 0 ? p : "~";
@ -209,7 +201,7 @@ FilesystemNodeWin32::FilesystemNodeWin32(const string& p)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string FilesystemNodeWin32::getShortPath() const string FilesystemNodeWINDOWS::getShortPath() const
{ {
// If the path starts with the home directory, replace it with '~' // If the path starts with the home directory, replace it with '~'
const string& home = myHomeFinder.getHomePath(); const string& home = myHomeFinder.getHomePath();
@ -225,7 +217,7 @@ string FilesystemNodeWin32::getShortPath() const
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool FilesystemNodeWin32:: bool FilesystemNodeWINDOWS::
getChildren(AbstractFSList& myList, ListMode mode, bool hidden) const getChildren(AbstractFSList& myList, ListMode mode, bool hidden) const
{ {
assert(_isDirectory); assert(_isDirectory);
@ -241,7 +233,7 @@ bool FilesystemNodeWin32::
for (TCHAR *current_drive = drive_buffer; *current_drive; for (TCHAR *current_drive = drive_buffer; *current_drive;
current_drive += _tcslen(current_drive) + 1) current_drive += _tcslen(current_drive) + 1)
{ {
FilesystemNodeWin32 entry; FilesystemNodeWINDOWS entry;
char drive_name[2]; char drive_name[2];
drive_name[0] = toAscii(current_drive)[0]; drive_name[0] = toAscii(current_drive)[0];
@ -252,7 +244,7 @@ bool FilesystemNodeWin32::
entry._isValid = true; entry._isValid = true;
entry._isPseudoRoot = false; entry._isPseudoRoot = false;
entry._path = toAscii(current_drive); entry._path = toAscii(current_drive);
myList.push_back(new FilesystemNodeWin32(entry)); myList.push_back(new FilesystemNodeWINDOWS(entry));
} }
} }
else else
@ -281,7 +273,7 @@ bool FilesystemNodeWin32::
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool FilesystemNodeWin32::makeDir() bool FilesystemNodeWINDOWS::makeDir()
{ {
if(!_isPseudoRoot && CreateDirectory(_path.c_str(), NULL) != 0) if(!_isPseudoRoot && CreateDirectory(_path.c_str(), NULL) != 0)
{ {
@ -293,7 +285,7 @@ bool FilesystemNodeWin32::makeDir()
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool FilesystemNodeWin32::rename(const string& newfile) bool FilesystemNodeWINDOWS::rename(const string& newfile)
{ {
if(!_isPseudoRoot && MoveFile(_path.c_str(), newfile.c_str()) != 0) if(!_isPseudoRoot && MoveFile(_path.c_str(), newfile.c_str()) != 0)
{ {
@ -305,12 +297,12 @@ bool FilesystemNodeWin32::rename(const string& newfile)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
AbstractFSNode* FilesystemNodeWin32::getParent() const AbstractFSNode* FilesystemNodeWINDOWS::getParent() const
{ {
if (!_isValid || _isPseudoRoot) if (!_isValid || _isPseudoRoot)
return 0; return 0;
FilesystemNodeWin32* p = new FilesystemNodeWin32(); FilesystemNodeWINDOWS* p = new FilesystemNodeWINDOWS();
if (_path.size() > 3) if (_path.size() > 3)
{ {
const char *start = _path.c_str(); const char *start = _path.c_str();

16
src/win32/FSNodeWin32.hxx → src/windows/FSNodeWINDOWS.hxx
View File

@ -17,8 +17,8 @@
// $Id$ // $Id$
//============================================================================ //============================================================================
#ifndef FS_NODE_WIN32_HXX #ifndef FS_NODE_WINDOWS_HXX
#define FS_NODE_WIN32_HXX #define FS_NODE_WINDOWS_HXX
#include <tchar.h> #include <tchar.h>
@ -36,19 +36,19 @@ static HomeFinder myHomeFinder;
* Parts of this class are documented in the base interface class, * Parts of this class are documented in the base interface class,
* AbstractFSNode. * AbstractFSNode.
*/ */
class FilesystemNodeWin32 : public AbstractFSNode class FilesystemNodeWINDOWS : public AbstractFSNode
{ {
public: public:
/** /**
* Creates a FilesystemNodeWin32 with the root node as path. * Creates a FilesystemNodeWINDOWS with the root node as path.
* *
* In regular windows systems, a virtual root path is used "". * In regular windows systems, a virtual root path is used "".
* In windows CE, the "\" root is used instead. * In windows CE, the "\" root is used instead.
*/ */
FilesystemNodeWin32(); FilesystemNodeWINDOWS();
/** /**
* Creates a FilesystemNodeWin32 for a given path. * Creates a FilesystemNodeWINDOWS for a given path.
* *
* Examples: * Examples:
* path=c:\foo\bar.txt, currentDir=false -> c:\foo\bar.txt * path=c:\foo\bar.txt, currentDir=false -> c:\foo\bar.txt
@ -57,7 +57,7 @@ class FilesystemNodeWin32 : public AbstractFSNode
* *
* @param path String with the path the new node should point to. * @param path String with the path the new node should point to.
*/ */
FilesystemNodeWin32(const string& path); FilesystemNodeWINDOWS(const string& path);
bool exists() const; bool exists() const;
const string& getName() const { return _displayName; } const string& getName() const { return _displayName; }
@ -89,7 +89,7 @@ class FilesystemNodeWin32 : public AbstractFSNode
virtual void setFlags(); virtual void setFlags();
/** /**
* Adds a single FilesystemNodeWin32 to a given list. * Adds a single FilesystemNodeWINDOWS to a given list.
* This method is used by getChildren() to populate the directory entries list. * This method is used by getChildren() to populate the directory entries list.
* *
* @param list List to put the file entry node in. * @param list List to put the file entry node in.

0
src/win32/HomeFinder.hxx → src/windows/HomeFinder.hxx
View File

12
src/win32/OSystemWin32.cxx → src/windows/OSystemWINDOWS.cxx
View File

@ -24,7 +24,7 @@
#include "FSNode.hxx" #include "FSNode.hxx"
#include "HomeFinder.hxx" #include "HomeFinder.hxx"
#include "OSystem.hxx" #include "OSystem.hxx"
#include "OSystemWin32.hxx" #include "OSystemWINDOWS.hxx"
/** /**
Each derived class is responsible for calling the following methods Each derived class is responsible for calling the following methods
@ -37,7 +37,7 @@
*/ */
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
OSystemWin32::OSystemWin32() OSystemWINDOWS::OSystemWINDOWS()
: OSystem() : OSystem()
{ {
string basedir = ""; string basedir = "";
@ -86,12 +86,12 @@ OSystemWin32::OSystemWin32()
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
OSystemWin32::~OSystemWin32() OSystemWINDOWS::~OSystemWINDOWS()
{ {
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string OSystemWin32::defaultSnapSaveDir() string OSystemWINDOWS::defaultSnapSaveDir()
{ {
HomeFinder homefinder; HomeFinder homefinder;
FilesystemNode desktop(homefinder.getDesktopPath()); FilesystemNode desktop(homefinder.getDesktopPath());
@ -99,13 +99,13 @@ string OSystemWin32::defaultSnapSaveDir()
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string OSystemWin32::defaultSnapLoadDir() string OSystemWINDOWS::defaultSnapLoadDir()
{ {
return defaultSnapSaveDir(); return defaultSnapSaveDir();
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void OSystemWin32::setAppWindowPos(int x, int y, int w, int h) void OSystemWINDOWS::setAppWindowPos(int x, int y, int w, int h)
{ {
SDL_SysWMinfo sdl_info; SDL_SysWMinfo sdl_info;
memset(&sdl_info, 0, sizeof(sdl_info)); memset(&sdl_info, 0, sizeof(sdl_info));

12
src/win32/OSystemWin32.hxx → src/windows/OSystemWINDOWS.hxx
View File

@ -17,8 +17,8 @@
// $Id$ // $Id$
//============================================================================ //============================================================================
#ifndef OSYSTEM_WIN32_HXX #ifndef OSYSTEM_WINDOWS_HXX
#define OSYSTEM_WIN32_HXX #define OSYSTEM_WINDOWS_HXX
#include "OSystem.hxx" #include "OSystem.hxx"
#include "bspf.hxx" #include "bspf.hxx"
@ -29,18 +29,18 @@
@author Stephen Anthony @author Stephen Anthony
@version $Id$ @version $Id$
*/ */
class OSystemWin32 : public OSystem class OSystemWINDOWS : public OSystem
{ {
public: public:
/** /**
Create a new Win32 operating system object Create a new WINDOWS operating system object
*/ */
OSystemWin32(); OSystemWINDOWS();
/** /**
Destructor Destructor
*/ */
virtual ~OSystemWin32(); virtual ~OSystemWINDOWS();
public: public:
/** /**

0
src/win32/SDL_win32_main.c → src/windows/SDL_win32_main.c
View File

12
src/win32/SerialPortWin32.cxx → src/windows/SerialPortWINDOWS.cxx
View File

@ -19,23 +19,23 @@
#include <windows.h> #include <windows.h>
#include "SerialPortWin32.hxx" #include "SerialPortWINDOWS.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SerialPortWin32::SerialPortWin32() SerialPortWINDOWS::SerialPortWINDOWS()
: SerialPort(), : SerialPort(),
myHandle(NULL) myHandle(NULL)
{ {
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SerialPortWin32::~SerialPortWin32() SerialPortWINDOWS::~SerialPortWINDOWS()
{ {
closePort(); closePort();
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool SerialPortWin32::openPort(const string& device) bool SerialPortWINDOWS::openPort(const string& device)
{ {
if(!myHandle) if(!myHandle)
{ {
@ -68,7 +68,7 @@ bool SerialPortWin32::openPort(const string& device)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
void SerialPortWin32::closePort() void SerialPortWINDOWS::closePort()
{ {
if(myHandle) if(myHandle)
{ {
@ -78,7 +78,7 @@ void SerialPortWin32::closePort()
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool SerialPortWin32::writeByte(const uInt8* data) bool SerialPortWINDOWS::writeByte(const uInt8* data)
{ {
if(myHandle) if(myHandle)
{ {

10
src/win32/SerialPortWin32.hxx → src/windows/SerialPortWINDOWS.hxx
View File

@ -17,8 +17,8 @@
// $Id$ // $Id$
//============================================================================ //============================================================================
#ifndef SERIALPORT_WIN32_HXX #ifndef SERIALPORT_WINDOWS_HXX
#define SERIALPORT_WIN32_HXX #define SERIALPORT_WINDOWS_HXX
#include <windows.h> #include <windows.h>
@ -30,11 +30,11 @@
@author Stephen Anthony @author Stephen Anthony
@version $Id$ @version $Id$
*/ */
class SerialPortWin32 : public SerialPort class SerialPortWINDOWS : public SerialPort
{ {
public: public:
SerialPortWin32(); SerialPortWINDOWS();
virtual ~SerialPortWin32(); virtual ~SerialPortWINDOWS();
/** /**
Open the given serial port with the specified attributes. Open the given serial port with the specified attributes.

6
src/win32/SettingsWin32.cxx → src/windows/SettingsWINDOWS.cxx
View File

@ -19,10 +19,10 @@
#include "bspf.hxx" #include "bspf.hxx"
#include "Settings.hxx" #include "Settings.hxx"
#include "SettingsWin32.hxx" #include "SettingsWINDOWS.hxx"
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SettingsWin32::SettingsWin32(OSystem* osystem) SettingsWINDOWS::SettingsWINDOWS(OSystem* osystem)
: Settings(osystem) : Settings(osystem)
{ {
setInternal("gl_lib", "opengl32.dll"); setInternal("gl_lib", "opengl32.dll");
@ -30,6 +30,6 @@ SettingsWin32::SettingsWin32(OSystem* osystem)
} }
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
SettingsWin32::~SettingsWin32() SettingsWINDOWS::~SettingsWINDOWS()
{ {
} }

10
src/win32/SettingsWin32.hxx → src/windows/SettingsWINDOWS.hxx
View File

@ -17,25 +17,25 @@
// $Id$ // $Id$
//============================================================================ //============================================================================
#ifndef SETTINGS_WIN32_HXX #ifndef SETTINGS_WINDOWS_HXX
#define SETTINGS_WIN32_HXX #define SETTINGS_WINDOWS_HXX
class OSystem; class OSystem;
#include "bspf.hxx" #include "bspf.hxx"
class SettingsWin32 : public Settings class SettingsWINDOWS : public Settings
{ {
public: public:
/** /**
Create a new UNIX settings object Create a new UNIX settings object
*/ */
SettingsWin32(OSystem* osystem); SettingsWINDOWS(OSystem* osystem);
/** /**
Destructor Destructor
*/ */
virtual ~SettingsWin32(); virtual ~SettingsWINDOWS();
}; };
#endif #endif

0
src/win32/Stella.sln → src/windows/Stella.sln
View File

38
src/win32/Stella.vcxproj → src/windows/Stella.vcxproj
View File

@ -101,8 +101,8 @@
<ClCompile> <ClCompile>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\yacc;..\emucore;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat;..\zlib;..\libpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\yacc;..\emucore;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;THUMB_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>BSPF_WINDOWS;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;THUMB_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@ -133,8 +133,8 @@ SDLmain.lib
<ClCompile> <ClCompile>
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<Optimization>Disabled</Optimization> <Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\yacc;..\emucore;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat;..\zlib;..\libpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\yacc;..\emucore;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;THUMB_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>BSPF_WINDOWS;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;THUMB_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>false</MinimalRebuild> <MinimalRebuild>false</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks> <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@ -163,8 +163,8 @@ SDLmain.lib
<AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/MP %(AdditionalOptions)</AdditionalOptions>
<OmitFramePointers>true</OmitFramePointers> <OmitFramePointers>true</OmitFramePointers>
<WholeProgramOptimization>false</WholeProgramOptimization> <WholeProgramOptimization>false</WholeProgramOptimization>
<AdditionalIncludeDirectories>..\yacc;..\emucore;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat;..\zlib;..\libpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\yacc;..\emucore;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;THUMB_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>BSPF_WINDOWS;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;THUMB_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>false</RuntimeTypeInfo> <RuntimeTypeInfo>false</RuntimeTypeInfo>
<PrecompiledHeader> <PrecompiledHeader>
@ -197,8 +197,8 @@ SDLmain.lib
<Optimization>Full</Optimization> <Optimization>Full</Optimization>
<InlineFunctionExpansion>Default</InlineFunctionExpansion> <InlineFunctionExpansion>Default</InlineFunctionExpansion>
<OmitFramePointers>true</OmitFramePointers> <OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>..\yacc;..\emucore;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\win32;..\cheat;..\zlib;..\libpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\yacc;..\emucore;..\common;..\common\tv_filters;..\gui;..\debugger\gui;..\debugger;..\windows;..\cheat;..\zlib;..\libpng;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>BSPF_WIN32;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;THUMB_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>BSPF_WINDOWS;WIN32;NDEBUG;JOYSTICK_SUPPORT;DEBUGGER_SUPPORT;THUMB_SUPPORT;DISPLAY_OPENGL;WINDOWED_SUPPORT;SOUND_SUPPORT;CHEATCODE_SUPPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
<RuntimeTypeInfo>false</RuntimeTypeInfo> <RuntimeTypeInfo>false</RuntimeTypeInfo>
<PrecompiledHeader> <PrecompiledHeader>
@ -227,7 +227,6 @@ SDLmain.lib
<ClCompile Include="..\common\FBSurfaceGL.cxx" /> <ClCompile Include="..\common\FBSurfaceGL.cxx" />
<ClCompile Include="..\common\FBSurfaceTIA.cxx" /> <ClCompile Include="..\common\FBSurfaceTIA.cxx" />
<ClCompile Include="..\common\FrameBufferGL.cxx" /> <ClCompile Include="..\common\FrameBufferGL.cxx" />
<ClCompile Include="..\common\FrameBufferSoft.cxx" />
<ClCompile Include="..\common\FSNodeZIP.cxx" /> <ClCompile Include="..\common\FSNodeZIP.cxx" />
<ClCompile Include="..\common\MouseControl.cxx" /> <ClCompile Include="..\common\MouseControl.cxx" />
<ClCompile Include="..\common\tv_filters\atari_ntsc.c" /> <ClCompile Include="..\common\tv_filters\atari_ntsc.c" />
@ -278,18 +277,17 @@ SDLmain.lib
<ClCompile Include="..\gui\FileListWidget.cxx" /> <ClCompile Include="..\gui\FileListWidget.cxx" />
<ClCompile Include="..\gui\LoggerDialog.cxx" /> <ClCompile Include="..\gui\LoggerDialog.cxx" />
<ClCompile Include="..\gui\SnapshotDialog.cxx" /> <ClCompile Include="..\gui\SnapshotDialog.cxx" />
<ClCompile Include="FSNodeWin32.cxx" /> <ClCompile Include="FSNodeWINDOWS.cxx" />
<ClCompile Include="..\common\mainSDL.cxx"> <ClCompile Include="..\common\mainSDL.cxx">
<Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Full</Optimization> <Optimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Full</Optimization>
<WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</WholeProgramOptimization> <WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</WholeProgramOptimization>
<WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</WholeProgramOptimization> <WholeProgramOptimization Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</WholeProgramOptimization>
</ClCompile> </ClCompile>
<ClCompile Include="OSystemWin32.cxx" /> <ClCompile Include="OSystemWINDOWS.cxx" />
<ClCompile Include="..\common\PNGLibrary.cxx" /> <ClCompile Include="..\common\PNGLibrary.cxx" />
<ClCompile Include="..\common\RectList.cxx" />
<ClCompile Include="SDL_win32_main.c" /> <ClCompile Include="SDL_win32_main.c" />
<ClCompile Include="SerialPortWin32.cxx" /> <ClCompile Include="SerialPortWINDOWS.cxx" />
<ClCompile Include="SettingsWin32.cxx" /> <ClCompile Include="SettingsWINDOWS.cxx" />
<ClCompile Include="..\common\SoundSDL.cxx" /> <ClCompile Include="..\common\SoundSDL.cxx" />
<ClCompile Include="..\emucore\AtariVox.cxx" /> <ClCompile Include="..\emucore\AtariVox.cxx" />
<ClCompile Include="..\emucore\Booster.cxx" /> <ClCompile Include="..\emucore\Booster.cxx" />
@ -461,7 +459,6 @@ SDLmain.lib
<ClInclude Include="..\common\FBSurfaceGL.hxx" /> <ClInclude Include="..\common\FBSurfaceGL.hxx" />
<ClInclude Include="..\common\FBSurfaceTIA.hxx" /> <ClInclude Include="..\common\FBSurfaceTIA.hxx" />
<ClInclude Include="..\common\FrameBufferGL.hxx" /> <ClInclude Include="..\common\FrameBufferGL.hxx" />
<ClInclude Include="..\common\FrameBufferSoft.hxx" />
<ClInclude Include="..\common\FSNodeFactory.hxx" /> <ClInclude Include="..\common\FSNodeFactory.hxx" />
<ClInclude Include="..\common\FSNodeZIP.hxx" /> <ClInclude Include="..\common\FSNodeZIP.hxx" />
<ClInclude Include="..\common\MouseControl.hxx" /> <ClInclude Include="..\common\MouseControl.hxx" />
@ -529,13 +526,12 @@ SDLmain.lib
<ClInclude Include="..\libpng\pnginfo.h" /> <ClInclude Include="..\libpng\pnginfo.h" />
<ClInclude Include="..\libpng\pnglibconf.h" /> <ClInclude Include="..\libpng\pnglibconf.h" />
<ClInclude Include="..\libpng\pngstruct.h" /> <ClInclude Include="..\libpng\pngstruct.h" />
<ClInclude Include="FSNodeWin32.hxx" /> <ClInclude Include="FSNodeWINDOWS.hxx" />
<ClInclude Include="HomeFinder.hxx" /> <ClInclude Include="HomeFinder.hxx" />
<ClInclude Include="OSystemWin32.hxx" /> <ClInclude Include="OSystemWINDOWS.hxx" />
<ClInclude Include="..\common\PNGLibrary.hxx" /> <ClInclude Include="..\common\PNGLibrary.hxx" />
<ClInclude Include="..\common\RectList.hxx" /> <ClInclude Include="SerialPortWINDOWS.hxx" />
<ClInclude Include="SerialPortWin32.hxx" /> <ClInclude Include="SettingsWINDOWS.hxx" />
<ClInclude Include="SettingsWin32.hxx" />
<ClInclude Include="..\common\SharedPtr.hxx" /> <ClInclude Include="..\common\SharedPtr.hxx" />
<ClInclude Include="..\common\SoundSDL.hxx" /> <ClInclude Include="..\common\SoundSDL.hxx" />
<ClInclude Include="..\common\Stack.hxx" /> <ClInclude Include="..\common\Stack.hxx" />
@ -711,4 +707,4 @@ SDLmain.lib
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets"> <ImportGroup Label="ExtensionTargets">
</ImportGroup> </ImportGroup>
</Project> </Project>

30
src/win32/Stella.vcxproj.filters → src/windows/Stella.vcxproj.filters
View File

@ -54,31 +54,25 @@
<ClCompile Include="..\common\FrameBufferGL.cxx"> <ClCompile Include="..\common\FrameBufferGL.cxx">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\common\FrameBufferSoft.cxx"> <ClCompile Include="FSNodeWINDOWS.cxx">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="FSNodeWin32.cxx">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\common\mainSDL.cxx"> <ClCompile Include="..\common\mainSDL.cxx">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="OSystemWin32.cxx"> <ClCompile Include="OSystemWINDOWS.cxx">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\common\PNGLibrary.cxx"> <ClCompile Include="..\common\PNGLibrary.cxx">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\common\RectList.cxx">
<Filter>Source Files</Filter>
</ClCompile>
<ClCompile Include="SDL_win32_main.c"> <ClCompile Include="SDL_win32_main.c">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="SerialPortWin32.cxx"> <ClCompile Include="SerialPortWINDOWS.cxx">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="SettingsWin32.cxx"> <ClCompile Include="SettingsWINDOWS.cxx">
<Filter>Source Files</Filter> <Filter>Source Files</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\common\SoundSDL.cxx"> <ClCompile Include="..\common\SoundSDL.cxx">
@ -740,25 +734,19 @@
<ClInclude Include="..\common\FrameBufferGL.hxx"> <ClInclude Include="..\common\FrameBufferGL.hxx">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\common\FrameBufferSoft.hxx">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="HomeFinder.hxx"> <ClInclude Include="HomeFinder.hxx">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="OSystemWin32.hxx"> <ClInclude Include="OSystemWINDOWS.hxx">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\common\PNGLibrary.hxx"> <ClInclude Include="..\common\PNGLibrary.hxx">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\common\RectList.hxx"> <ClInclude Include="SerialPortWINDOWS.hxx">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="SerialPortWin32.hxx"> <ClInclude Include="SettingsWINDOWS.hxx">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="SettingsWin32.hxx">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\common\SharedPtr.hxx"> <ClInclude Include="..\common\SharedPtr.hxx">
@ -1346,7 +1334,7 @@
<ClInclude Include="..\common\FSNodeZIP.hxx"> <ClInclude Include="..\common\FSNodeZIP.hxx">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="FSNodeWin32.hxx"> <ClInclude Include="FSNodeWINDOWS.hxx">
<Filter>Header Files</Filter> <Filter>Header Files</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\common\ZipHandler.hxx"> <ClInclude Include="..\common\ZipHandler.hxx">
@ -1480,4 +1468,4 @@
<Filter>Resource Files</Filter> <Filter>Resource Files</Filter>
</ResourceCompile> </ResourceCompile>
</ItemGroup> </ItemGroup>
</Project> </Project>

14
src/windows/module.mk Normal file
View File

@ -0,0 +1,14 @@
MODULE := src/windows
MODULE_OBJS := \
src/windows/FSNodeWINDOWS.o \
src/windows/OSystemWINDOWS.o \
src/windows/SerialPortWINDOWS.o \
src/windows/SettingsWINDOWS.o \
src/windows/stella_icon.o
MODULE_DIRS += \
src/windows
# Include common rules
include $(srcdir)/common.rules

0
src/win32/resource.h → src/windows/resource.h
View File

0
src/win32/stella.ico → src/windows/stella.ico
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 100 KiB

After

Width:  |  Height:  |  Size: 100 KiB

0
src/win32/stella.iss → src/windows/stella.iss
View File

0
src/win32/stella.rc → src/windows/stella.rc
View File