diff options
| author | Neil <nyamatongwe@gmail.com> | 2014-05-31 14:30:40 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2014-05-31 14:30:40 +1000 |
| commit | db97fec51d3ee8f8f53b8d9ac99c867b87603482 (patch) | |
| tree | 7005243941ea178d93122f6fcab5b874a65dbc78 | |
| parent | 63fe59d106ae478ff93a39f2b789b5269f3d2d0e (diff) | |
| download | scintilla-mirror-db97fec51d3ee8f8f53b8d9ac99c867b87603482.tar.gz | |
Use standard macro of C++ compiler CXX. Remove definitions that are not needed.
| -rw-r--r-- | win32/scintilla.mak | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/win32/scintilla.mak b/win32/scintilla.mak index ef2293779..eaa407d3b 100644 --- a/win32/scintilla.mak +++ b/win32/scintilla.mak @@ -17,8 +17,6 @@ COMPONENT=$(DIR_BIN)\Scintilla.dll LEXCOMPONENT=$(DIR_BIN)\SciLexer.dll LEXLIB=Lexers.lib -CC=cl -RC=rc LD=link CXXFLAGS=-Zi -TP -MP -W4 -EHsc -Zc:forScope -Zc:wchar_t -D_CRT_SECURE_NO_DEPRECATE=1 @@ -31,7 +29,7 @@ LIBS=KERNEL32.lib USER32.lib GDI32.lib IMM32.lib OLE32.LIB NOLOGO=-nologo !IFDEF QUIET -CC=@$(CC) +CXX=@$(CXX) CXXFLAGS=$(CXXFLAGS) $(NOLOGO) LDFLAGS=$(LDFLAGS) $(NOLOGO) !ENDIF @@ -219,23 +217,23 @@ $(LEXLIB): $(LEXOBJS) # Define how to build all the objects and what they depend on {..\src}.cxx{$(DIR_O)}.obj:: - $(CC) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $< + $(CXX) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $< {..\lexlib}.cxx{$(DIR_O)}.obj:: - $(CC) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $< + $(CXX) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $< {..\lexers}.cxx{$(DIR_O)}.obj:: - $(CC) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $< + $(CXX) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $< {.}.cxx{$(DIR_O)}.obj:: - $(CC) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $< + $(CXX) $(CXXFLAGS) -c $(NAME)$(DIR_O)\ $< # Some source files are compiled into more than one object because of different conditional compilation $(DIR_O)\ScintillaBaseL.obj: ..\src\ScintillaBase.cxx - $(CC) $(CXXFLAGS) -DSCI_LEXER -c $(NAME)$@ ..\src\ScintillaBase.cxx + $(CXX) $(CXXFLAGS) -DSCI_LEXER -c $(NAME)$@ ..\src\ScintillaBase.cxx $(DIR_O)\ScintillaWinL.obj: ScintillaWin.cxx - $(CC) $(CXXFLAGS) -DSCI_LEXER -c $(NAME)$@ ScintillaWin.cxx + $(CXX) $(CXXFLAGS) -DSCI_LEXER -c $(NAME)$@ ScintillaWin.cxx $(DIR_O)\ScintillaWinS.obj: ScintillaWin.cxx - $(CC) $(CXXFLAGS) -DSTATIC_BUILD -c $(NAME)$@ ScintillaWin.cxx + $(CXX) $(CXXFLAGS) -DSTATIC_BUILD -c $(NAME)$@ ScintillaWin.cxx # Dependencies |