fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2024-11-10 07:21:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

change windows makefiles so that they aren't for cross-building by default;

Browse source 
keep the cross-build stuff only in the scripts. update the explanations in
windows and darwin makefiles.


git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@1183 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2015-03-02 22:04:26 +00:00
parent 3e1eae3e47
commit de4c27b793
3 changed files with 19 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Quake/Makefile.darwin
View file

@ -1,8 +1,9 @@
# GNU Makefile for QuakeSpasm for Mac OS X, Sep. 10, 2014. # GNU Makefile for compiling Mac OS X version of QuakeSpasm.
# Usage: "make -f Makefile.darwin" # Usage: "make -f Makefile.darwin"
# You need the SDL library fully installed. # To cross-compile on Linux hosts, see the "build_cross_osx*.sh" scripts.
# "make DEBUG=1" to build a debug client. # "make DEBUG=1" to build a debug client.
# "make SDL_FRAMEWORK_PATH=/path/to/Frameworks" to specify the directory containing SDL.framework # "make SDL_FRAMEWORK_PATH=/path/to/Frameworks" to specify the directory
# containing SDL.framework and override the locally included versions.
# "make DO_USERDIRS=1" to enable user directories support # "make DO_USERDIRS=1" to enable user directories support
# Enable/Disable user directories support # Enable/Disable user directories support

24
Quake/Makefile.w32
View file

@ -1,9 +1,9 @@
# GNU Makefile for cross-compiling quakespasm.exe (Win32: MinGW) # GNU Makefile for compiling Win32 quakespasm.exe using MinGW or MinGW-w64.
# using cross-toolchains on a linux host, Sep. 10, 2014 # Usage: "make -f Makefile.w32"
# To cross-compile on Linux hosts, see the "build_cross_win32*.sh" scripts.
# "make DEBUG=1" to build a debug client. # "make DEBUG=1" to build a debug client.
# "make SDL_CONFIG=/path/to/sdl-config" for unusual SDL installations. # "make SDL_CONFIG=/path/to/sdl-config" to override the locally included SDL versions.
# "make WINSOCK2=1" to use WinSock2 api instead of old WinSock 1.1. # "make WINSOCK2=1" to use WinSock2 api instead of old WinSock 1.1.
# "make CROSS_COMPILE=0" to build natively on windows with mingw and msys
### Enable/disable SDL2 ### Enable/disable SDL2
USE_SDL2=0 USE_SDL2=0
@ -39,21 +39,11 @@ WINSOCK2?= 0
# build variables # build variables
# --------------------------- # ---------------------------
TARGET=i686-pc-mingw32 CC = gcc
CROSS_COMPILE=1
ifeq ($(CROSS_COMPILE),1)
TOOLCHAIN_PREFIX=$(TARGET)-
else
TOOLCHAIN_PREFIX=
endif
CC = $(TOOLCHAIN_PREFIX)gcc
LINKER = $(CC) LINKER = $(CC)
WINDRES = $(TOOLCHAIN_PREFIX)windres WINDRES = windres
STRIP = $(TOOLCHAIN_PREFIX)strip STRIP = strip
#CPUFLAGS= -mtune=i686 #CPUFLAGS= -mtune=i686
#CPUFLAGS= -march=pentium4 #CPUFLAGS= -march=pentium4

26
Quake/Makefile.w64
View file

@ -1,9 +1,9 @@
# GNU Makefile for cross-compiling quakespasm.exe (Win64: MinGW-w64) # GNU Makefile for compiling Win64 quakespasm.exe using MinGW-w64.
# using cross-toolchains on a linux host, Sep. 10, 2014 # Usage: "make -f Makefile.w64"
# To cross-compile on Linux hosts, see the "build_cross_win32*.sh" scripts.
# "make DEBUG=1" to build a debug client. # "make DEBUG=1" to build a debug client.
# "make SDL_CONFIG=/path/to/sdl-config" for unusual SDL installations. # "make SDL_CONFIG=/path/to/sdl-config" to override the locally included SDL versions.
# "make WINSOCK2=0" to use the old WinSock 1.1 api (NOT recommended). # "make WINSOCK2=0" to use the old WinSock 1.1 api (NOT RECOMMENDED)
# "make CROSS_COMPILE=0" to build natively on windows with mingw and msys
### Enable/disable SDL2 ### Enable/disable SDL2
USE_SDL2=0 USE_SDL2=0
@ -39,21 +39,11 @@ WINSOCK2?= 1
# build variables # build variables
# --------------------------- # ---------------------------
TARGET=x86_64-w64-mingw32 CC = gcc
CROSS_COMPILE=1
ifeq ($(CROSS_COMPILE),1)
TOOLCHAIN_PREFIX=$(TARGET)-
else
TOOLCHAIN_PREFIX=
endif
CC = $(TOOLCHAIN_PREFIX)gcc
LINKER = $(CC) LINKER = $(CC)
WINDRES = $(TOOLCHAIN_PREFIX)windres WINDRES = windres
STRIP = $(TOOLCHAIN_PREFIX)strip STRIP = strip
CPUFLAGS= CPUFLAGS=
LDFLAGS = LDFLAGS =