From f5ce7f7f779f97985777ff36863e746e6d00c8c8 Mon Sep 17 00:00:00 2001 From: David Schmidt Date: Fri, 2 Mar 2012 19:35:46 +0000 Subject: [PATCH] Geez, the build wasn't really picking up the native printer code for Win32! --- doc/web/src/site/apt/operating.apt | 4 ++-- src/scc_socket_driver.c | 2 +- src/vars_win32_sdl | 4 ++-- src/win_console.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/web/src/site/apt/operating.apt b/doc/web/src/site/apt/operating.apt index 33f6cbc..eca81a4 100644 --- a/doc/web/src/site/apt/operating.apt +++ b/doc/web/src/site/apt/operating.apt @@ -13,7 +13,7 @@ not freely distributable. You must own a IIgs ROM (i.e. a IIgs machine) in order to legally use a ROM file that you may find on the internet. GSport can use the ROM image from either a ROM01 or ROM03 IIgs machine. -By default, that file should be named <>> and be placed in the same folder as the GSport program/app. +By default, that file should be named <<>> and be placed in the same folder as the GSport program/app. The name and location are configurable options, but it will "just work" with the defaults. * Running GSport @@ -29,7 +29,7 @@ application itself. Start GSport by Double-clicking the GSport icon on a Mac, or by running the executable (<<>> on Windows, and <<>> on Linux). GSport can be run by the Terminal window on a Mac as well (which enables access to -more debug information) by typing: "./GSport.app/Contents/MacOS/GSport". +more debug information) by typing: <<<./GSport.app/Contents/MacOS/GSport>>> from the folder GSport is in. Assuming all goes well, GSport will then boot up but probably not find any disk images. Hit the "F4" key and see below for how to tell GSport what disk images to use. diff --git a/src/scc_socket_driver.c b/src/scc_socket_driver.c index b69dbca..612b4db 100644 --- a/src/scc_socket_driver.c +++ b/src/scc_socket_driver.c @@ -29,7 +29,7 @@ extern Scc scc_stat[2]; extern int g_serial_modem[]; -#ifndef _MSC_VER //OG +#if !(defined _MSC_VER || defined __CYGWIN__) extern int h_errno; #else #define socklen_t int diff --git a/src/vars_win32_sdl b/src/vars_win32_sdl index 994cd58..93de5e1 100644 --- a/src/vars_win32_sdl +++ b/src/vars_win32_sdl @@ -1,8 +1,8 @@ TARGET = gsport.exe TFEOBJ = tfe/tfe.o arch/win32/tfearch.o tfe/tfesupp.o OBJECTS = $(OBJECTS1) $(TFEOBJ) scc_windriver.o win32snd_driver.o win_console.o win_generic.o -CCOPTS = -O2 -DGSPORT_LITTLE_ENDIAN -DHAVE_TFE -DWIN_SOUND -DHAVE_SDL -CPPOPTS = -O2 -DGSPORT_LITTLE_ENDIAN -DHAVE_TFE -DHAVE_SDL -I /usr/include/freetype2 -I/usr/include/SDL +CCOPTS = -O2 -DGSPORT_LITTLE_ENDIAN -DHAVE_TFE -DWIN_SOUND -DHAVE_SDL -DWIN32 -D_WIN32 -D__USE_W32_SOCKETS +CPPOPTS = -O2 -DGSPORT_LITTLE_ENDIAN -DHAVE_TFE -DHAVE_SDL -DWIN32 -D_WIN32 -D__USE_W32_SOCKETS -I /usr/include/freetype2 -I/usr/include/SDL SUFFIX = ".exe" NAME = gsport EXTRA_LIBS = -lSDL -lfreetype -lcomdlg32 diff --git a/src/win_console.c b/src/win_console.c index ff0b169..2c4715f 100644 --- a/src/win_console.c +++ b/src/win_console.c @@ -62,7 +62,7 @@ void get_cwd(LPTSTR buffer, int size) HMODULE hSelf; hSelf = GetModuleHandle(NULL); GetModuleFileName(hSelf,buffer,size); - PathRemoveFileSpec(buffer); + //PathRemoveFileSpec(buffer); printf("Local directory: [%s]\n",buffer); }