Browse Source

makefile.unix: WXINCLUDEPATHS now only used for building GUI object files.

Moved it out of CXXFLAGS and into the command-line for the GUI objects.
    It will no longer be invoked for non-GUI and crypto object files.
0.8
Matt Giuca 14 years ago
parent
commit
3415b15a56
  1. 4
      makefile.unix

4
makefile.unix

@ -25,7 +25,7 @@ LIBS= \
DEFS=-DNOPCH -DFOURWAYSSE2 -DUSE_SSL DEFS=-DNOPCH -DFOURWAYSSE2 -DUSE_SSL
DEBUGFLAGS=-g -D__WXDEBUG__ DEBUGFLAGS=-g -D__WXDEBUG__
CXXFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS) $(WXINCLUDEPATHS) CXXFLAGS=-O2 -Wno-invalid-offsetof -Wformat $(DEBUGFLAGS) $(DEFS)
HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \ HEADERS=headers.h strlcpy.h serialize.h uint256.h util.h key.h bignum.h base58.h \
script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h script.h db.h net.h irc.h main.h rpc.h uibase.h ui.h noui.h init.h
@ -46,7 +46,7 @@ all: bitcoin
obj/%.o: %.cpp $(HEADERS) obj/%.o: %.cpp $(HEADERS)
$(CXX) -c $(CXXFLAGS) -DGUI -o $@ $< $(CXX) -c $(CXXFLAGS) $(WXINCLUDEPATHS) -DGUI -o $@ $<
cryptopp/obj/%.o: cryptopp/%.cpp cryptopp/obj/%.o: cryptopp/%.cpp
$(CXX) -c $(CXXFLAGS) -O3 -o $@ $< $(CXX) -c $(CXXFLAGS) -O3 -o $@ $<

Loading…
Cancel
Save