-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathdds.diff
73 lines (59 loc) · 2.25 KB
/
dds.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
diff --git a/src/Makefiles/Makefile_Mac_clang_shared b/src/Makefiles/Makefile_Mac_clang_shared
index f3b4454..03316cf 100644
--- a/src/Makefiles/Makefile_Mac_clang_shared
+++ b/src/Makefiles/Makefile_Mac_clang_shared
@@ -1,7 +1,7 @@
# --------------------- INFORMATION --------------------------------
# This the DDS Makefile for MacOS and the clang compiler.
-# It creates a dynamically linked (shared) library, libdds.so.
+# It creates a dynamically linked (shared) library, libdds.dylib.
# --------------------- CONFIGURATION ------------------------------
@@ -61,7 +61,7 @@ CC = g++
WARN_FLAGS = \
-Wshadow \
-Wsign-conversion \
- -pedantic -Wall -Wextra \
+ -pedantic -Wall -Wextra -Wno-deprecated-declarations -Wno-sign-conversion \
-Wcast-align -Wcast-qual \
-Wctor-dtor-privacy \
-Wdisabled-optimization \
@@ -86,7 +86,7 @@ COMPILE_FLAGS = -fPIC -O3 -flto -mtune=generic -std=c++11 \
$(DDS_BEHAVIOR) $(THREAD_COMPILE) $(THREADING)
DLLBASE = dds
-SHARED_LIB = lib$(DLLBASE).so
+SHARED_LIB = lib$(DLLBASE).dylib
LINK_FLAGS = \
-shared \
@@ -97,12 +97,13 @@ include $(INCL_SOURCE)
O_FILES = $(subst .cpp,.o,$(SOURCE_FILES))
+TARGET =
macos: $(O_FILES)
- $(CC) -o $(SHARED_LIB) $(O_FILES) $(LINK_FLAGS)
+ $(CC) -o $(SHARED_LIB) $(O_FILES) $(LINK_FLAGS) $(TARGET) -lc++
%.o: %.cpp
- $(CC) $(COMPILE_FLAGS) -c $<
+ $(CC) $(COMPILE_FLAGS) $(TARGET) $(CFLAGS) -c $<
depend:
makedepend -Y -- $(SOURCE_FILES)
diff --git a/src/Makefiles/Makefile_linux_shared b/src/Makefiles/Makefile_linux_shared
index 29898fb..c35956a 100644
--- a/src/Makefiles/Makefile_linux_shared
+++ b/src/Makefiles/Makefile_linux_shared
@@ -108,7 +108,7 @@ linux: $(O_FILES)
-o $(SHARED_LIB) $(O_FILES) $(LINK_FLAGS)
%.o: %.cpp
- $(CC) $(COMPILE_FLAGS) -c $<
+ $(CC) $(COMPILE_FLAGS) $(CFLAGS) -c $<
depend:
makedepend -Y -- $(SOURCE_FILES)
diff --git a/src/Makefiles/Makefile_mingw b/src/Makefiles/Makefile_mingw
index c5a0c2e..97bf893 100644
--- a/src/Makefiles/Makefile_mingw
+++ b/src/Makefiles/Makefile_mingw
@@ -110,7 +110,7 @@ O_FILES = $(subst .cpp,.o,$(SOURCE_FILES)) $(VFILE).o
mingw: $(O_FILES)
$(CC) $(LINK1_FLAGS) $(O_FILES) \
- -o $(DLL) $(LINK2_FLAGS)
+ -o $(DLL) $(LINK2_FLAGS) -static
%.o: %.cpp
$(CC) $(COMPILE_FLAGS) -c $<