|
@@ -5,20 +5,13 @@ OBJ=$(OUT)/obj
|
|
OBJS=$(OBJ)/worley_noise.o
|
|
OBJS=$(OBJ)/worley_noise.o
|
|
|
|
|
|
|
|
|
|
-<<<<<<< HEAD
|
|
|
|
all: bin/worley_noise
|
|
all: bin/worley_noise
|
|
|
|
|
|
bin/worley_noise: $(OBJS)
|
|
bin/worley_noise: $(OBJS)
|
|
- $(CC) $(CFLAGS) $(OBJS) -o $(OUT)/worley_noise
|
|
|
|
|
|
+ $(CC) $(CFLAGS) $(OBJS) -o $(OUT)/worley_noise -lX11 -lm
|
|
|
|
|
|
bin/obj/worley_noise.o: worley_noise.c
|
|
bin/obj/worley_noise.o: worley_noise.c
|
|
-=======
|
|
|
|
-all: $(OBJS)
|
|
|
|
- $(CC) $(CFLAGS) $(OBJS) -o $(OUT)/worley_noise
|
|
|
|
-
|
|
|
|
-bin/obj/worley_noise.o:
|
|
|
|
->>>>>>> 78289eb... all: several makefile corrections and organization steps
|
|
|
|
- $(CC) $(CFLAGS) -c worley_noise.c -o $(OBJ)/worley_noise.o
|
|
|
|
|
|
+ $(CC) $(CFLAGS) -c worley_noise.c -o $(OBJ)/worley_noise.o -lX11 -lm
|
|
|
|
|
|
clean:
|
|
clean:
|
|
find ./bin -type f -exec rm {} \;
|
|
find ./bin -type f -exec rm {} \;
|