Permalink
Browse files

Simplified cyclone core file inclusion.

  • Loading branch information...
1 parent 895e2db commit bf91bfa12351ea4e89a4926b4a0b8cdb5e3cd638 @ButchDean ButchDean committed Oct 2, 2014
Showing with 17 additions and 73 deletions.
  1. +1 −1 Makefile
  2. +1 −1 linuxmake.mk
  3. +1 −5 src/body.cpp
  4. +1 −5 src/collide_coarse.cpp
  5. +1 −5 src/collide_fine.cpp
  6. +1 −5 src/contacts.cpp
  7. +1 −5 src/core.cpp
  8. +1 −5 src/fgen.cpp
  9. +1 −5 src/joints.cpp
  10. +1 −5 src/particle.cpp
  11. +1 −5 src/pcontacts.cpp
  12. +1 −5 src/pfgen.cpp
  13. +1 −5 src/plinks.cpp
  14. +2 −6 src/pworld.cpp
  15. +1 −5 src/random.cpp
  16. +1 −5 src/world.cpp
View
@@ -13,7 +13,7 @@ RANLIB=ranlib
# CYCLONEPHYSICS LIB
-CXXFLAGS=-O2 -fPIC
+CXXFLAGS=-O2 -Iinclude -fPIC
CYCLONEOBJS=src/body.o src/collide_coarse.o src/collide_fine.o src/contacts.o src/core.o src/fgen.o src/joints.o src/particle.o src/pcontacts.o src/pfgen.o src/plinks.o src/pworld.o src/random.o src/world.o
View
@@ -26,7 +26,7 @@ CYCLONEFILES = ./src/body.cpp ./src/collide_coarse.cpp ./src/collide_fine.cpp ./
all: $(DEMOLIST)
$(DEMOLIST):
- g++ -O2 $(DEMOCOREFILES) $(CYCLONEFILES) $(DEMOPATH)$@/$@.cpp -o $@ $(LDFLAGS)
+ g++ -O2 -Iinclude $(DEMOCOREFILES) $(CYCLONEFILES) $(DEMOPATH)$@/$@.cpp -o $@ $(LDFLAGS)
clean:
rm $(DEMOLIST)
View
@@ -10,11 +10,7 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include "../include/cyclone/body.h"
-#else
- #include <cyclone/body.h>
-#endif
+#include <cyclone/body.h>
#include <memory.h>
#include <assert.h>
@@ -10,11 +10,7 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include "../include/cyclone/collide_coarse.h"
-#else
- #include <cyclone/collide_coarse.h>
-#endif
+#include <cyclone/collide_coarse.h>
using namespace cyclone;
@@ -10,11 +10,7 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include "../include/cyclone/collide_fine.h"
-#else
- #include <cyclone/collide_fine.h>
-#endif
+#include <cyclone/collide_fine.h>
#include <memory.h>
#include <assert.h>
#include <cstdlib>
View
@@ -10,11 +10,7 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include "../include/cyclone/contacts.h"
-#else
- #include <cyclone/contacts.h>
-#endif
+#include <cyclone/contacts.h>
#include <memory.h>
#include <assert.h>
View
@@ -10,11 +10,7 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include "../include/cyclone/core.h"
-#else
- #include <cyclone/core.h>
-#endif
+#include <cyclone/core.h>
using namespace cyclone;
View
@@ -10,11 +10,7 @@
* software license.
*/
-#ifdef __gnu_linux__
- #include "../include/cyclone/fgen.h"
-#else
- #include <cyclone/fgen.h>
-#endif
+#include <cyclone/fgen.h>
using namespace cyclone;
View
@@ -10,11 +10,7 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include "../include/cyclone/cyclone.h"
-#else
- #include <cyclone/cyclone.h>
-#endif
+#include <cyclone/cyclone.h>
using namespace cyclone;
View
@@ -11,11 +11,7 @@
*/
#include <assert.h>
-#ifdef __gnu_linux__
- #include "../include/cyclone/particle.h"
-#else
- #include <cyclone/particle.h>
-#endif
+#include <cyclone/particle.h>
using namespace cyclone;
View
@@ -10,11 +10,7 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include "../include/cyclone/pcontacts.h"
-#else
- #include <cyclone/pcontacts.h>
-#endif
+#include <cyclone/pcontacts.h>
using namespace cyclone;
View
@@ -10,11 +10,7 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include "../include/cyclone/pfgen.h"
-#else
- #include <cyclone/pfgen.h>
-#endif
+#include <cyclone/pfgen.h>
using namespace cyclone;
View
@@ -10,11 +10,7 @@
* software licence.
*/
-#ifdef __gnu_linux__
- #include "../include/cyclone/plinks.h"
-#else
- #include <cyclone/plinks.h>
-#endif
+#include <cyclone/plinks.h>
using namespace cyclone;
View
@@ -10,12 +10,8 @@
* software licence.
*/
-#include <cstdlib>
-#ifdef __gnu_linux__
- #include "../include/cyclone/pworld.h"
-#else
- #include <cyclone/pworld.h>
-#endif
+#include <cstddef>
+#include <cyclone/pworld.h>
using namespace cyclone;
View
@@ -12,11 +12,7 @@
#include <cstdlib>
#include <ctime>
-#ifdef __gnu_linux__
- #include "../include/cyclone/random.h"
-#else
- #include <cyclone/random.h>
-#endif
+#include <cyclone/random.h>
using namespace cyclone;
View
@@ -11,11 +11,7 @@
*/
#include <cstdlib>
-#ifdef __gnu_linux__
- #include "../include/cyclone/world.h"
-#else
- #include <cyclone/world.h>
-#endif
+#include <cyclone/world.h>
using namespace cyclone;

0 comments on commit bf91bfa

Please sign in to comment.