Changeset 1723


Ignore:
Timestamp:
Nov 21, 2011, 5:29:13 PM (8 years ago)
Author:
ksherdy
Message:

Updated gml2svg.

Location:
proto/gml2svg/C/parabix
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • proto/gml2svg/C/parabix/Makefile

    r1715 r1723  
    88endif
    99
    10 PAPI_DIR=/usr/local/papi
    11 LIB_DIR=../../lib/C
     10PAPI_DIR=/usr/local
    1211
    1312ARCH=$(shell getconf LONG_BIT)
    1413ifeq ($(ARCH),32)
    1514    AFLAGS=-march=pentium4
    16     PAPI = -I$(PAPI_DIR)/include -L$(PAPI_DIR)/lib -lpapi -I$(LIB_DIR)/cc
     15    PAPI = -I$(PAPI_DIR)/include -L$(PAPI_DIR)/lib -lpapi -DPAPI -Ilib/cclib
    1716else
    1817    AFLAGS=-march=nocona -m64
    19     PAPI = -I$(PAPI_DIR)/include -L$(PAPI_DIR)/lib -lpapi -I$(LIB_DIR)/cc
     18    PAPI = -I$(PAPI_DIR)/include -L$(PAPI_DIR)/lib -lpapi -DPAPI -Ilib/cclib
    2019endif
    2120
    22 INCLUDES=-I$(LIB_DIR)
    23 SRC=$(LIB_DIR)/style_ext/style_ext.c $(LIB_DIR)/gml2svg/util.cpp $(LIB_DIR)/gml2svg/constants.cpp $(LIB_DIR)/gml2svg/vancouver_constants.cpp
     21LIBC=../../lib/C
     22SRC=$(LIBC)/style_ext/style_ext.c $(LIBC)/gml2svg/util.cpp $(LIBC)/gml2svg/constants.cpp $(LIBC)/gml2svg/vancouver_constants.cpp lib/cclib/cc.cxx
    2423FLAGS=-DMORE -DMEMCPY_IO -DILAX_COORDS_TO_PATH #-DWORLD2SCREEN #-DSYSTEM_TIME #-DGML2SVG_DEBUG   
    2524
     
    2928                src/bitplex.h src/bitplex.c src/xmlmodel.h src/xmlmodel.c\
    3029                src/bytelex.h src/charsets/ASCII_EBCDIC.h
    31         $(CC) -o gml2svg gml2svg.cxx $(SRC) $(AFLAGS) $(INCLUDES) $(FLAGS) #$(PAPI)
     30        $(CC) -o gml2svg gml2svg.cxx $(SRC) $(AFLAGS) -I$(LIBC) $(FLAGS) # $(PAPI)
    3231
    3332markup_stats:   markup_stats.cxx src/byteplex.h src/multiliteral.h src/engine.h\
  • proto/gml2svg/C/parabix/gml2svg.cxx

    r1715 r1723  
    133133
    134134#if defined(PAPI)
    135         #include "cc.h"
     135        #include "lib/cclib/cc.h"
    136136        CC * code_clocker;
    137137#endif
Note: See TracChangeset for help on using the changeset viewer.