Revision 936

trunk/contrib/GNUmakefile (revision 936)
20 20
ifneq ($(SHELL),sh.exe)
21 21
	$(AR) -rs $(DISK)/contrib/lib/libcontrib.a ../build/objects/dist/saflp-contrib-*.obj
22 22
	$(AR) -rs $(DISK)/contrib/lib/libcontribo.a ../build/objects/dist/optlp-contrib-*.obj
23
else
24
	$(AR) -rs $(DISK)\contrib\lib\libcontrib.a ..\build\objects\dist\saflp-contrib-*.obj
25
	$(AR) -rs $(DISK)\contrib\lib\libcontribo.a ..\build\objects\dist\optlp-contrib-*.obj
23 26
endif
24 27

  
25 28

  
trunk/scripts/admb/adcomp.bat (revision 936)
23 23
set model=%~n1
24 24
if defined CXXFLAGS (set CXXFLAGS=%CXXFLAGS% )
25 25

  
26
set CMD=g++ -c %CXXFLAGS% %sym% -D__GNUDOS__ %dll% -Dlinux %opt% -DUSE_LAPLACE -fpermissive -I. -I"%ADMB_HOME%\include" -I"%ADMB_HOME%\contrib" -o %model%.obj %model%.cpp
26
set CMD=g++ -c %CXXFLAGS% %sym% -D__GNUDOS__ %dll% -Dlinux %opt% -DUSE_LAPLACE -fpermissive -I. -I"%ADMB_HOME%\include" -I"%ADMB_HOME%\contrib\include" -o %model%.obj %model%.cpp
27 27
echo %CMD%
28 28
%CMD%
29 29

  
trunk/src/GNUmakefile (revision 936)
1 1
MAKEFLAG_J=-j 1
2
ifndef DISK
3
DISK=../build/dist
2

  
3
ifeq ($(SHELL),sh.exe)
4
  DISK=..\build\dist
5
  LIBPATH=..\build\objects\dist
6
  CXXFLAGS_INCLUDES:=-I..\${DISK}\include
7
else
8
  DISK=../build/dist
9
  LIBPATH=../build/objects/dist
10
  CXXFLAGS_INCLUDES:=-I../${DISK}/include
4 11
endif
5 12

  
6 13
ifndef INSTALL_DIR
7 14
INSTALL_DIR=/usr/local/admb
8 15
endif
9 16

  
17
ifeq ($(SHELL),sh.exe)
10 18
PWD=$(shell pwd)
11

  
12
ifndef LIBPATH
13
LIBPATH=../build/objects/dist
19
else
20
PWD=$(shell cd)
14 21
endif
15 22

  
16
CXXFLAGS_INCLUDES:=-I../${DISK}/include
23

  
17 24
ifeq ($(CXX),CC)
18 25
CXXFLAGS:=-D__GNUDOS__ -Dlinux -D__SPDLL__ -DUSE_LAPLACE $(CXXFLAGS)
19 26
else
......
27 34
endif
28 35

  
29 36
all: dist contrib
37
ifneq ($(SHELL),sh.exe)
30 38
	@printf "\nADMB build completed.\n"
31 39
	@printf "For installation, check README.txt.\n"
40
endif
32 41

  
33 42
dist:
43
ifneq ($(SHELL),sh.exe)
34 44
	rm -rf ${DISK}
35 45
	mkdir -p ${DISK}
36 46
	cp -R ../contrib ${DISK}
......
45 55
	cp -f ../VERSION ${DISK}
46 56
	cp -f ../Makefile ${DISK}
47 57
	rm -rf `find ${DISK} -type d -name .svn`
58
else
59
	if exist ${DISK} rd /S /Q ${DISK}
60
	md ${DISK}
61
	md ${DISK}\contrib
62
	xcopy ..\contrib $(DISK)\contrib /S
63
	md ${DISK}\docs
64
	xcopy ..\docs $(DISK)\docs /S
65
	md ${DISK}\examples
66
	xcopy ..\examples $(DISK)\examples /S
67
	md ${DISK}\src
68
	xcopy ..\src $(DISK)\src /S
69
	md ${DISK}\tests
70
	xcopy ..\tests $(DISK)\tests /S
71
	md ${DISK}\utilities
72
	copy /Y ..\LICENSE.txt ${DISK}
73
	copy /Y ..\README.txt ${DISK}
74
	copy /Y ..\NEWS.txt ${DISK}
75
	copy /Y ..\VERSION ${DISK}
76
	copy /Y ..\Makefile ${DISK}
... This diff was truncated because it exceeds the maximum size that can be displayed.

Also available in: Unified diff