Permalink
Browse files

Fix using CXX, CC as usual to prevent override problems (Windows build)

  • Loading branch information...
1 parent c37d8b4 commit 23009bf35d742458457c0df25210dbe7a67e992e @ntrel ntrel committed Jun 4, 2012
Showing with 5 additions and 5 deletions.
  1. +5 −5 scintilla/makefile.win32
View
@@ -8,8 +8,8 @@
# To force GTK+ 1 build, define GTK1 on the make command line.
.SUFFIXES: .cxx .c .o .h .a
-CC = g++
-CCOMP = gcc
+CXX = g++
+CC = gcc
AR = ar
RANLIB = ranlib
PREFIX = C:\libs
@@ -55,9 +55,9 @@ CONFIGFLAGS=$(GTK_INCLUDES)
MARSHALLER=scintilla-marshal.o
.cxx.o:
- $(CC) $(CXXFLAGS) -c $<
+ $(CXX) $(CXXFLAGS) -c $<
.c.o:
- $(CCOMP) $(CXXFLAGS) -c $<
+ $(CC) $(CXXFLAGS) -c $<
LEXOBJS=\
LexAda.o \
@@ -139,7 +139,7 @@ $(COMPLIB): $(MARSHALLER) $(LEXOBJS) $(SRCOBJS)
$(RANLIB) $@
deps.mak:
- $(CC) -MM $(CXXFLAGS) gtk/*.cxx lexers/*.cxx lexlib/*.cxx src/*.cxx >deps.mak
+ $(CXX) -MM $(CXXFLAGS) gtk/*.cxx lexers/*.cxx lexlib/*.cxx src/*.cxx >deps.mak
# Generate header dependencies with "make deps.mak"
include deps.mak

0 comments on commit 23009bf

Please sign in to comment.