diff options
| author | Matt Giuca <[email protected]> | 2011-02-26 09:10:10 +1100 |
|---|---|---|
| committer | Matt Giuca <[email protected]> | 2011-02-26 09:10:10 +1100 |
| commit | 3415b15a56e2ffec16c831d5994b969daa65dc2b (patch) | |
| tree | d150bd376b75a9c1c4dd1d12bf8e646d62980df9 | |
| parent | makefile.unix: Removed redundant use of wx-config in DEFS (it was being inclu... (diff) | |
| download | discoin-3415b15a56e2ffec16c831d5994b969daa65dc2b.tar.xz discoin-3415b15a56e2ffec16c831d5994b969daa65dc2b.zip | |
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.
| -rw-r--r-- | makefile.unix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/makefile.unix b/makefile.unix index 383de9ade..229263912 100644 --- a/makefile.unix +++ b/makefile.unix @@ -25,7 +25,7 @@ LIBS= \ DEFS=-DNOPCH -DFOURWAYSSE2 -DUSE_SSL 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 \ 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) - $(CXX) -c $(CXXFLAGS) -DGUI -o $@ $< + $(CXX) -c $(CXXFLAGS) $(WXINCLUDEPATHS) -DGUI -o $@ $< cryptopp/obj/%.o: cryptopp/%.cpp $(CXX) -c $(CXXFLAGS) -O3 -o $@ $< |