citrun

commit 1fa8a7cf13dacfcbc57b3eaa318cc15b6a708295
parent 922c2ee4f8f0ce0e53aac1f74ccc025a0b368a89
Author: Kyle Milz <kyle@0x30.net>
Date:   Tue, 19 Sep 2017 01:23:57 -0600

jam: start to de-win32

Diffstat:
M
bin/Jamfile
 | 
19
+++----------------
M
lib/Jamfile
 | 
10
+++-------

2 files changed, 6 insertions(+), 23 deletions(-)
diff --git a/bin/Jamfile b/bin/Jamfile
@@ -27,32 +27,19 @@ ShellReplace citrun_wrap : wrap.sh ;
 INST_SRCS =
 	inst_main.cc
 	inst_fe.cc
+	inst_feunix.cc
 	inst_action.cc
 	inst_visitor.cc ;
 
-if $(NT) {
-	INST_SRCS += inst_fewin32.cc ;
-} else {
-	INST_SRCS += inst_feunix.cc ;
-}
-
 Stringize lib_h.h : lib.h ;
 
 ObjectC++Flags $(INST_SRCS) : $(INST_CFLAGS) -DPREFIX=\\\"$(PREFIX)\\\" ;
 
-LINKFLAGS on citrun_inst$(SUFEXE) = $(LINKFLAGS) $(INST_LDFLAGS) ;
-LINKLIBS on citrun_inst$(SUFEXE) += $(INST_LIBS) ;
+LINKFLAGS on citrun_inst = $(LINKFLAGS) $(INST_LDFLAGS) ;
+LINKLIBS on citrun_inst += $(INST_LIBS) ;
 
 Main citrun_inst : $(INST_SRCS) ;
 
-if $(NT) {
-	for i in cl.exe link.exe {
-		MakeLocate $(i) : compilers ;
-		File $(i) : citrun_inst.exe ;
-		Clean clean : $(i) ;
-	}
-}
-
 #
 # citrun_gl,  citrun_gltest
 #
diff --git a/lib/Jamfile b/lib/Jamfile
@@ -1,10 +1,6 @@
 SubDir TOP lib ;
 
-if $(NT) {
-	Library libcitrun : lib.c lib_win32.c ;
-} else {
-	ObjectCcFlags lib.c lib_unix.c : -fPIC -ansi ;
-	Library libcitrun : lib.c lib_unix.c ;
+ObjectCcFlags lib.c lib_unix.c : -fPIC -ansi ;
+Library libcitrun : lib.c lib_unix.c ;
 
-	InstallLib $(PREFIX)/lib : libcitrun.a ;
-}
+InstallLib $(PREFIX)/lib : libcitrun.a ;