[geany/geany] 23009b: Fix using CXX, CC as usual to prevent override problems (Windows build)

[Nick Treleaven]

Branch:      refs/heads/master
Author:      Nick Treleaven <nick.treleaven at btinternet.com>
Committer:   Nick Treleaven <nick.treleaven at btinternet.com>
Date:        Mon, 04 Jun 2012 12:51:04
Commit:      23009bf35d742458457c0df25210dbe7a67e992e
             https://github.com/geany/geany/commit/23009bf35d742458457c0df25210dbe7a67e992e

Log Message:
-----------
Fix using CXX, CC as usual to prevent override problems (Windows build)


Modified Paths:
--------------
    scintilla/makefile.win32

Modified: scintilla/makefile.win32
10 files changed, 5 insertions(+), 5 deletions(-)
===================================================================
@@ -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


@@ Diff output truncated at 100000 characters. @@


--------------
This E-Mail was brought to you by github_commit_mail.py (Source: TBD).