From e250c3d57f795355ab9387f8651154a76ba0bac6 Mon Sep 17 00:00:00 2001
From: pagefault <>
Date: Tue, 1 May 2001 20:23:27 +0000
Subject: [PATCH] Removed use joystick port 209h from windows port

---
 zsnes/src/gui/guimisc.inc  | 2 +-
 zsnes/src/gui/guimouse.inc | 2 +-
 zsnes/src/gui/guiwindp.inc | 6 +++---
 zsnes/src/makefile.dos     | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/zsnes/src/gui/guimisc.inc b/zsnes/src/gui/guimisc.inc
index 6bd4fc59..a9c53e86 100644
--- a/zsnes/src/gui/guimisc.inc
+++ b/zsnes/src/gui/guimisc.inc
@@ -256,7 +256,7 @@ CalibrateDev1:
     mov ebx,[GUIInputRefP+eax*4]
     mov bl,[ebx]
     mov byte[GUICBHold],0
-%ifndef __LINUX__
+%ifdef __MSDOS__
     cmp byte[pl1p209+eax],0
     jne near .port209
 %endif
diff --git a/zsnes/src/gui/guimouse.inc b/zsnes/src/gui/guimouse.inc
index e75ed855..9e18e5bf 100644
--- a/zsnes/src/gui/guimouse.inc
+++ b/zsnes/src/gui/guimouse.inc
@@ -1971,7 +1971,7 @@ DisplayGUIInputClick:
     DGOptnsProcBoxb 165,145,[edi+4]
     DGOptnsProcBoxb 125,135,[edi+8]
     DGOptnsProcBoxb 125,145,[edi+12]
-%ifndef __LINUX__
+%ifdef __MSDOS__
     xor ebx,ebx
     mov bl,[cplayernum]
     GUIClickCButtonID 5,162,byte[pl1p209+ebx]
diff --git a/zsnes/src/gui/guiwindp.inc b/zsnes/src/gui/guiwindp.inc
index 6280484f..420e0873 100644
--- a/zsnes/src/gui/guiwindp.inc
+++ b/zsnes/src/gui/guiwindp.inc
@@ -1017,7 +1017,7 @@ DisplayGUIInput:
     GUIOuttextwin2 3,76,132,GUIInputTextA
     GUIOuttextwin2 3,76,142,GUIInputTextB
     GUIOuttextwin2 3,76,152,GUIInputTextC
-%ifndef __LINUX__
+%ifdef __MSDOS__
     GUIOuttextwin2 3,20,167,GUIInputTextW
 %endif
     GUIOuttextwin2 3,156,102,GUIInputText7
@@ -1041,7 +1041,7 @@ DisplayGUIInput:
     GUIOuttextwin2 3,75,131,GUIInputTextA
     GUIOuttextwin2 3,75,141,GUIInputTextB
     GUIOuttextwin2 3,75,151,GUIInputTextC
-%ifndef __LINUX__
+%ifdef __MSDOS__
     GUIOuttextwin2 3,20,167,GUIInputTextW
 %endif
     GUIOuttextwin2 3,155,101,GUIInputText7
@@ -1052,7 +1052,7 @@ DisplayGUIInput:
     GUIOuttextwin2 3,152,146,GUIInputTexte
     GUIOuttextwin2 3,112,136,GUIInputTextf
     GUIOuttextwin2 3,112,146,GUIInputTextg
-%ifndef __LINUX__
+%ifdef __MSDOS__
     mov dword[GUITemp],GUIIconDataCheckBoxUC
     xor eax,eax
     mov al,[cplayernum]
diff --git a/zsnes/src/makefile.dos b/zsnes/src/makefile.dos
index bd651488..940eec2a 100644
--- a/zsnes/src/makefile.dos
+++ b/zsnes/src/makefile.dos
@@ -59,9 +59,9 @@ MAINOBJ=cfgload.o endmem.o fixsin.o init.o ui.o vcache.o water.o
 
 OBJS=${CHIPSOBJ} ${CPUOBJ} ${DOSOBJ} ${GUIOBJ} ${VIDEOBJ} ${PREOBJ} ${MAINOBJ} ${ZIPOBJ}
 LIBS=-lz -lgcc -lm
-CFLAGS=
+CFLAGS=-D__MSDOS__
 ASM=nasm
-ASMFLAGS=-f coff
+ASMFLAGS=-f coff -D__MSDOS__
 CC=gcc
 PP=gpp