diff options
| author | Chris Want <cwant@ualberta.ca> | 2003-05-25 09:22:46 +0400 |
|---|---|---|
| committer | Chris Want <cwant@ualberta.ca> | 2003-05-25 09:22:46 +0400 |
| commit | fcad2744d7a10ac11ef18ca0abed237cdda34bba (patch) | |
| tree | 6e50abfe39c1ee34865dc8e1ad5842258bb7506b /source/nan_compile.mk | |
| parent | 6e6a73f38e39c84f4a2da983169957437bbe11a5 (diff) | |
Some tweaks to make the windows-gcc play nice with irix.
Diffstat (limited to 'source/nan_compile.mk')
| -rw-r--r-- | source/nan_compile.mk | 84 |
1 files changed, 40 insertions, 44 deletions
diff --git a/source/nan_compile.mk b/source/nan_compile.mk index f023d43402e..41d722d000f 100644 --- a/source/nan_compile.mk +++ b/source/nan_compile.mk @@ -174,47 +174,46 @@ ifeq ($(OS),solaris) endif ifeq ($(OS),windows) - ifeq ($(FREE_WINDOWS),true) - CC = gcc - CCC = g++ - CFLAGS += -pipe -mno-cygwin -mwindows - CCFLAGS += -pipe -mno-cygwin -mwindows - CPPFLAGS += -DFREE_WINDOWS - #CPPFLAGS += -I/usr/include/mingw - REL_CFLAGS += -O2 - REL_CCFLAGS += -O2 - #NAN_DEPEND = true - #OPENGL_HEADERS = /usr/include/w32api - OPENGL_HEADERS = ./ - AR = ar - ARFLAGS = ruv - ARFLAGSQUIET = ru - WINRC = $(wildcard *.rc) - RANLIB = ranlib - else - CC = $(SRCHOME)/tools/cygwin/cl_wrapper.pl - CCC = $(SRCHOME)/tools/cygwin/cl_wrapper.pl - JAVAC = $(SRCHOME)/tools/cygwin/java_wrapper.pl -c - JAVAH = $(SRCHOME)/tools/cygwin/java_wrapper.pl -h - REL_CFLAGS += /O2 - REL_CCFLAGS += /O2 -GX - DBG_CFLAGS += /Fd$(DIR)/debug/ - DBG_CCFLAGS += /Fd$(DIR)/debug/ - CFLAGS += /MT - CCFLAGS += /MT - NAN_DEPEND = true - OPENGL_HEADERS = . - CPPFLAGS += -DWIN32 -D_WIN32 -D__WIN32 - CPPFLAGS += -D_M_IX86 - CPPFLAGS += -I"/cygdrive/c/Program Files/Microsoft Visual Studio/VC98/include" - JAVA_HEADERS = /cygdrive/c/j2sdk1.4.0-beta3/include - JAVA_SYSTEM_HEADERS = /cygdrive/c/j2sdk1.4.0-beta3/include/win32 - CPP = $(SRCHOME)/tools/cygwin/cl_wrapper.pl - AR = ar - ARFLAGS = ruv - ARFLAGSQUIET = ru - WINRC = $(wildcard *.rc) - endif + ifeq ($(FREE_WINDOWS),true) + CC = gcc + CCC = g++ + CFLAGS += -pipe -mno-cygwin -mwindows + CCFLAGS += -pipe -mno-cygwin -mwindows + CPPFLAGS += -DFREE_WINDOWS + REL_CFLAGS += -O2 + REL_CCFLAGS += -O2 + #NAN_DEPEND = true + #OPENGL_HEADERS = /usr/include/w32api + OPENGL_HEADERS = ./ + AR = ar + ARFLAGS = ruv + ARFLAGSQUIET = ru + WINRC = $(wildcard *.rc) + RANLIB = ranlib + else + CC = $(SRCHOME)/tools/cygwin/cl_wrapper.pl + CCC = $(SRCHOME)/tools/cygwin/cl_wrapper.pl + JAVAC = $(SRCHOME)/tools/cygwin/java_wrapper.pl -c + JAVAH = $(SRCHOME)/tools/cygwin/java_wrapper.pl -h + REL_CFLAGS += /O2 + REL_CCFLAGS += /O2 -GX + DBG_CFLAGS += /Fd$(DIR)/debug/ + DBG_CCFLAGS += /Fd$(DIR)/debug/ + CFLAGS += /MT + CCFLAGS += /MT + NAN_DEPEND = true + OPENGL_HEADERS = . + CPPFLAGS += -DWIN32 -D_WIN32 -D__WIN32 + CPPFLAGS += -D_M_IX86 + CPPFLAGS += -I"/cygdrive/c/Program Files/Microsoft Visual Studio/VC98/include" + JAVA_HEADERS = /cygdrive/c/j2sdk1.4.0-beta3/include + JAVA_SYSTEM_HEADERS = /cygdrive/c/j2sdk1.4.0-beta3/include/win32 + CPP = $(SRCHOME)/tools/cygwin/cl_wrapper.pl + AR = ar + ARFLAGS = ruv + ARFLAGSQUIET = ru + WINRC = $(wildcard *.rc) + endif endif ifeq (debug, $(findstring debug, $(MAKECMDGOALS))) @@ -264,9 +263,6 @@ $(DIR)/$(DEBUG_DIR)%.o: %.cpp $(CCC) -c $(CCFLAGS) $(CPPFLAGS) $< -o $@ endif -#$(DIR)/$(DEBUG_DIR)%.res: %.rc -# $(SRCHOME)/tools/cygwin/cl_wrapper.pl - rc /fo$@ $< - $(DIR)/$(DEBUG_DIR)%.res: %.rc ifeq ($(FREE_WINDOWS),true) windres $< -O coff -o $@ |