Browse Source

Small changes to makefile

Konstantin Ladutenko 10 years ago
parent
commit
296172b011
2 changed files with 3 additions and 3 deletions
  1. 2 2
      Makefile
  2. 1 1
      standalone.cc

+ 2 - 2
Makefile

@@ -11,7 +11,7 @@ all:
 	@echo "make builddeb - Generate a deb package"
 	@echo "make standalone - Create a standalone program"
 	@echo "make clean - Delete temporal files"
-
+	make standalone
 source:
 	$(PYTHON) setup.py sdist $(COMPILE) --dist-dir=../
 
@@ -31,7 +31,7 @@ builddeb:
 	dpkg-buildpackage -i -I -rfakeroot
 
 standalone: standalone.cc nmie.cc
-	c++ -DNDEBUG -O2 -std=c++11 standalone.cc nmie.cc -lm -o scattnlay
+	c++ -DNDEBUG -O2 -std=c++11 standalone.cc nmie.cc nmie-wrapper.cc -lm -o scattnlay
 	mv scattnlay ../
 
 clean:

+ 1 - 1
standalone.cc

@@ -210,7 +210,7 @@ int main(int argc, char *argv[]) {
 
 
 
-    nMie(L, x, m, nt, Theta, &Qext, &Qsca, &Qabs, &Qbk, &Qpr, &g, &Albedo, S1, S2);
+    //nMie(L, x, m, nt, Theta, &Qext, &Qsca, &Qabs, &Qbk, &Qpr, &g, &Albedo, S1, S2);
     nmie::nMie_wrapper(L, x, m, nt, Theta, &Qextw, &Qscaw, &Qabsw, &Qbkw, &Qprw, &gw, &Albedow, S1w, S2w);