Skip to content

Commit 9fa14b6

Browse files
authored
Merge pull request #4 from sdcTools/master
Adjusted make file
2 parents 3057d03 + f7700d6 commit 9fa14b6

9 files changed

Lines changed: 6397 additions & 6149 deletions

Makefile

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ ifeq ($(PLATFORM),Linux)
1717
SWIGDIR = /usr/local/bin
1818
JAVADIR = /home/argus/jdk1.7.0_25
1919
else
20-
GNUDIR = c:/MinGW/bin
21-
SWIGDIR = c:/swigwin-2.0.10
22-
JAVADIR = c:/Progra~1/Java/jdk1.7.0_17
20+
GNUDIR = C:/mingw/bin
21+
SWIGDIR = C:/swigwin-3.0.10
22+
JAVADIR = C:/Progra~2/Java/jdk1.7.0_80
2323
endif
2424

2525
LIBNAME = TauArgusJava
@@ -33,6 +33,7 @@ JAVAPACKAGE = tauargus.extern.dataengine
3333

3434
BUILDDIR = build
3535
DISTDIR = dist
36+
debug=yes
3637
ifdef debug
3738
CONF = Debug
3839
else
@@ -67,15 +68,15 @@ ifeq ($(PLATFORM),Linux)
6768
CFLAGS += -fPIC
6869
endif
6970
ifdef debug
70-
CFLAGS += -D_DEBUG -g
71+
CFLAGS += -D_DEBUG -g
7172
else
7273
CFLAGS += -DNDEBUG -O2
7374
endif
7475
LDFLAGS = -shared
7576
ifeq ($(PLATFORM),Linux)
7677
LDFLAGS += $(CFLAGS) -Wl,-soname,$(SONAME)
7778
else
78-
LDFLAGS += -Wl,--subsystem,windows -Wl,--kill-at
79+
LDFLAGS += $(CFLAGS) -Wl,--subsystem,windows -Wl,--kill-at -static-libgcc -static-libstdc++
7980
endif
8081

8182
# Exclude source files needed for a COM dll for Visual Basic 6.0

0 commit comments

Comments
 (0)