javaprofiler-commits

[Marek P. <ma...@us...>]

Update of /cvsroot/javaprofiler/library
In directory usw-pr-cvs1:/tmp/cvs-serv22574

Modified Files:
	config.mk 
Log Message:
win32 fixes



Index: config.mk
===================================================================
RCS file: /cvsroot/javaprofiler/library/config.mk,v
retrieving revision 1.37
retrieving revision 1.38
diff -C2 -r1.37 -r1.38
*** config.mk	15 Apr 2002 21:04:14 -0000	1.37
--- config.mk	16 Apr 2002 12:41:35 -0000	1.38
***************
*** 1,12 ****
  ################################################################
  # configuration file
! # Linux, x86, GNU C/C++ 3.0.2
  #
  # author: Marek Przeczek
  
! PROF_LIBRARY_NAME        = profiler/libprofiler.so
  PROF_JAVA_INTERF_PACKAGE = IProf.jar
  
! NATIVE_LIBRARY_NAME = libCommunShMem.so
  
  ################################################################
--- 1,12 ----
  ################################################################
  # configuration file
! # Microsoft Windows 9x/NT4.0/2000, x86, Visual C/C++ 6.0
  #
  # author: Marek Przeczek
  
! PROF_LIBRARY_NAME        = profiler\profiler.dll
  PROF_JAVA_INTERF_PACKAGE = IProf.jar
  
! NATIVE_LIBRARY_NAME = CommunShMem.dll
  
  ################################################################
***************
*** 15,28 ****
  # do not use "\" as a last character in path definition
  
! COMPILER_PATH = /home2/mm/gcc-3.0.2
! JAVA_PATH     = /home2/mm/j2sdk1.4.0
! DOXYGEN_PATH  = /home2/mm
! 
! CCC     = "$(COMPILER_PATH)/bin/g++"
! LD      = "$(COMPILER_PATH)/bin/g++"
! JAVAC   = "$(JAVA_PATH)/bin/javac"
! JAVAH   = "$(JAVA_PATH)/bin/javah"
! JAR     = "$(JAVA_PATH)/bin/jar"
! DOXYGEN = "$(DOXYGEN_PATH)/bin/doxygen"
  
  ################################################################
--- 15,28 ----
  # do not use "\" as a last character in path definition
  
! COMPILER_PATH = C:\Program Files\Microsoft Visual Studio\VC98
! JAVA_PATH     = C:\j2sdk1.4.0
! DOXYGEN_PATH  = C:\Program Files\doxygen-1.2.12
! 
! CCC     = "$(COMPILER_PATH)\Bin\cl"
! LD      = "$(COMPILER_PATH)\Bin\link"
! JAVAC   = "$(JAVA_PATH)\bin\javac"
! JAVAH   = "$(JAVA_PATH)\bin\javah"
! JAR     = "$(JAVA_PATH)\bin\jar"
! DOXYGEN = "$(DOXYGEN_PATH)\bin\doxygen"
  
  ################################################################
***************
*** 31,35 ****
  
  DOXYGENFLAGS =
! JAVACFLAGS   = -classpath ../../src2/$(PROF_JAVA_INTERF_PACKAGE)
  
  ################################################################
--- 31,35 ----
  
  DOXYGENFLAGS =
! JAVACFLAGS   = -classpath ..\..\src2\$(PROF_JAVA_INTERF_PACKAGE)
  
  ################################################################
***************
*** 37,68 ****
  # modify as needed
  
! DEFINES  = -DLINUX -DUSE_RAW_MONITORS -DUSE_ALLOCATOR -DEXPERIMENTAL -fpic
  
! INCLUDES = -I$(JAVA_PATH)/include -I$(JAVA_PATH)/include/linux
  
  # debug or not ?
  # choose one of following two possibilities
  
! FLAGS   = -O0 -D_DEBUG 
! #FLAGS   = -O3 -DNDEBUG -fno-rtti -fno-exceptions
  
! LDFLAGS = $(DEFINES) -shared -o $(PROF_LIBRARY_NAME) 
! LDLIBS  =
  
! LDFLAGS2 = $(DEFINES) -shared -o $(NATIVE_LIBRARY_NAME)
  LDLIBS2  =
  
! CPPFLAGS = -c $(FLAGS) $(DEFINES) $(INCLUDES)
  
  ################################################################
  # MAKEFILE
  
! MFLAGS = -f Makefile -C
  
  include dir.info
  
! all: $(addsuffix .dir.2, $(DIRS)) $(addsuffix .o, $(FILES)) 
! 
! clean: $(addsuffix .clean.2, $(DIRS))
! 	rm -Rf $(CLEAN_FILES)
! 
--- 37,70 ----
  # modify as needed
  
! DEFINES  = /DWIN32 /DUSE_RAW_MONITORS /DUSE_ALLOCATOR /DEXPERIMENTAL
  
! INCLUDES = /I "$(JAVA_PATH)\include" /I "$(JAVA_PATH)\include\win32"
  
  # debug or not ?
  # choose one of following two possibilities
  
! FLAGS   = /Od /Zi /D_DEBUG /MDd /LDd
! #FLAGS   = /O2 /Og /Oi /Ot /Ox /DNDEBUG /MD /LD /G6 /GD
  
! LDFLAGS = /NOLOGO /DLL /OUT:$(PROF_LIBRARY_NAME)
! LDLIBS  = wsock32.lib winmm.lib
  
! LDFLAGS2 = /NOLOGO /DLL /OUT:$(NATIVE_LIBRARY_NAME)
  LDLIBS2  =
  
! CPPFLAGS = /nologo /c $(FLAGS) $(DEFINES) $(INCLUDES)
  
  ################################################################
  # MAKEFILE
  
! MFLAGS = /NOLOGO /f Makefile.mak
  
  include dir.info
  
! all:
! 	for %i in (xxx $(DIRS))  do if not %%i == xxx $(MAKE) $(MFLAGS) %%i.dir
! 	for %i in (xxx $(FILES)) do if not %%i == xxx $(MAKE) $(MFLAGS) %%i.obj
! 
! clean:
! 	for %i in (xxx $(CLEAN_FILES)) do if exist %%i del %%i
! 	for %i in (xxx $(DIRS)) do if not %%i == xxx $(MAKE) $(MFLAGS) %%i.clean