zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-01-18 15:11:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Changed the Makefiles that are used by both Linux and MinGW so that msys

Browse source 
detection occurs only if $OS is Windows_NT. Otherwise, spurious nul files
  are created when compiling on Linux.


SVN r878 (trunk)
This commit is contained in:
Randy Heit 2008-04-03 23:16:07 +00:00
parent 935764e8c1
commit de485ec662
8 changed files with 23 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
docs/rh-log.txt
View file

@ -1,3 +1,8 @@
April 3, 2008
- Changed the Makefiles that are used by both Linux and MinGW so that msys
detection occurs only if $OS is Windows_NT. Otherwise, spurious nul files
are created when compiling on Linux.
April 3, 2008 (Changes by Graf Zahl) April 3, 2008 (Changes by Graf Zahl)
- Fixed: The minimum parameter count for ACS_Execute and ACS_ExecuteAlways for - Fixed: The minimum parameter count for ACS_Execute and ACS_ExecuteAlways for
DECORATE was wrong (2 instead of 1.) DECORATE was wrong (2 instead of 1.)

2
snes_spc/Makefile
View file

@ -3,10 +3,10 @@
CMD=0 CMD=0
ifeq (Windows_NT,$(OS)) ifeq (Windows_NT,$(OS))
CMD=1 CMD=1
endif
ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys) ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
CMD=0 CMD=0
endif endif
endif
STATICLIB = libsnes_spc.a STATICLIB = libsnes_spc.a

4
src/sound/music_mus_midiout.cpp
View file

@ -50,10 +50,6 @@
// EXTERNAL DATA DECLARATIONS ---------------------------------------------- // EXTERNAL DATA DECLARATIONS ----------------------------------------------
#ifdef _WIN32
extern UINT mididevice;
#endif
// PRIVATE DATA DEFINITIONS ------------------------------------------------ // PRIVATE DATA DEFINITIONS ------------------------------------------------
static const BYTE CtrlTranslate[15] = static const BYTE CtrlTranslate[15] =

3
tools/dehsupp/Makefile
View file

@ -1,11 +1,10 @@
ifeq (Windows_NT,$(OS)) ifeq (Windows_NT,$(OS))
WIN=1 WIN=1
WINCMD=1 WINCMD=1
endif
ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys) ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
WIN=1
WINCMD=0 WINCMD=0
endif endif
endif
ifeq (1,$(WIN)) ifeq (1,$(WIN))
EXE = dehsupp.exe EXE = dehsupp.exe

3
tools/lemon/Makefile
View file

@ -1,11 +1,10 @@
ifeq (Windows_NT,$(OS)) ifeq (Windows_NT,$(OS))
WIN=1 WIN=1
WINCMD=1 WINCMD=1
endif
ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys) ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
WIN=1
WINCMD=0 WINCMD=0
endif endif
endif
ifeq (1,$(WIN)) ifeq (1,$(WIN))
EXE = lemon.exe EXE = lemon.exe

3
tools/makewad/Makefile
View file

@ -1,11 +1,10 @@
ifeq (Windows_NT,$(OS)) ifeq (Windows_NT,$(OS))
WIN=1 WIN=1
WINCMD=1 WINCMD=1
endif
ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys) ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
WIN=1
WINCMD=0 WINCMD=0
endif endif
endif
ifeq (1,$(WIN)) ifeq (1,$(WIN))
EXE = makewad.exe EXE = makewad.exe

3
tools/re2c/Makefile
View file

@ -1,11 +1,10 @@
ifeq (Windows_NT,$(OS)) ifeq (Windows_NT,$(OS))
WIN=1 WIN=1
WINCMD=1 WINCMD=1
endif
ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys) ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
WIN=1
WINCMD=0 WINCMD=0
endif endif
endif
ifeq (1,$(WIN)) ifeq (1,$(WIN))
EXE = re2c.exe EXE = re2c.exe

3
tools/updaterevision/Makefile
View file

@ -1,11 +1,10 @@
ifeq (Windows_NT,$(OS)) ifeq (Windows_NT,$(OS))
WIN=1 WIN=1
WINCMD=1 WINCMD=1
endif
ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys) ifeq ($(findstring msys,$(shell sh --version 2>nul)),msys)
WIN=1
WINCMD=0 WINCMD=0
endif endif
endif
CC = gcc CC = gcc
CFLAGS = -Os -Wall -fomit-frame-pointer CFLAGS = -Os -Wall -fomit-frame-pointer