Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'core/org.eclipse.cdt.core.win32/library/Makefile')
-rw-r--r--core/org.eclipse.cdt.core.win32/library/Makefile18
1 files changed, 6 insertions, 12 deletions
diff --git a/core/org.eclipse.cdt.core.win32/library/Makefile b/core/org.eclipse.cdt.core.win32/library/Makefile
index c00aa7f93e6..176727fc01d 100644
--- a/core/org.eclipse.cdt.core.win32/library/Makefile
+++ b/core/org.eclipse.cdt.core.win32/library/Makefile
@@ -1,7 +1,7 @@
# makefile for libspawner.so
ifeq ($(JAVA_HOME),)
-$(warning JAVA_HOME not set in environment)
+$(error JAVA_HOME not set in environment)
endif
# Defaults which can be overridden.
@@ -11,8 +11,8 @@ ARCH = x86
JDK_INCLUDES= "$(JAVA_HOME)/include"
JDK_OS_INCLUDES= "$(JAVA_HOME)/include/$(OS)"
-CC=gcc
-CFLAGS = -DUNICODE -I$(JDK_INCLUDES) -I$(JDK_OS_INCLUDES)
+CC=g++
+CFLAGS = -DUNICODE -I$(JDK_INCLUDES) -I$(JDK_OS_INCLUDES)
CXX=g++
CXXFLAGS=$(CFLAGS)
@@ -22,18 +22,12 @@ LIB_NAME_SPAWNER = spawner.dll
LIB_NAME_FULL_SPAWNER = $(INSTALL_DIR)/spawner.dll
OBJS_SPAWNER=StdAfx.o Win32ProcessEx.o iostream.o raise.o spawner.o
-WINREG = $(INSTALL_DIR)/winreg.dll
-OBJS_WINREG = winreg.o
-
-all: $(LIB_NAME_FULL_SPAWNER) $(WINREG)
+all: $(LIB_NAME_FULL_SPAWNER)
rebuild: clean all
$(LIB_NAME_FULL_SPAWNER) : $(OBJS_SPAWNER)
- $(CC) -Wl,--kill-at -shared -o $(LIB_NAME_FULL_SPAWNER) $(OBJS_SPAWNER)
+ $(CC) -Wl,--kill-at -shared -o $(LIB_NAME_FULL_SPAWNER) $(OBJS_SPAWNER) -lpsapi
clean :
- $(RM) $(OBJS_SPAWNER) $(LIB_NAME_FULL_SPAWNER) $(OBJS_WINREG) $(WINREG)
-
-$(WINREG) : $(OBJS_WINREG)
- $(CXX) -Wl,--kill-at -shared -o $(WINREG) $(OBJS_WINREG)
+ $(RM) $(OBJS_SPAWNER)

Back to the top