linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2
committer: poy <poy@xxxxxxxxxx>
branch nick: dcpp-plugin-sdk-cpp
timestamp: Fri 2012-11-16 17:26:46 +0100
message:
  fiddle with the makefile
modified:
  projects/make/Makefile


--
lp:dcpp-plugin-sdk-cpp
https://code.launchpad.net/~dcplusplus-team/dcpp-plugin-sdk-cpp/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcpp-plugin-sdk-cpp.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcpp-plugin-sdk-cpp/trunk/+edit-subscription

=== modified file 'projects/make/Makefile'
--- projects/make/Makefile	2012-11-15 18:17:16 +0000
+++ projects/make/Makefile	2012-11-16 16:26:46 +0000
@@ -1,32 +1,35 @@
 # This is a rudimentary Makefile that compiles files from the pluginsdk & src directories into a
 # shared library. Adapt to your needs.
 
-CXX = $(PREFIX)g++$(SUFFIX)
-CXXFLAGS += -std=gnu++0x -Wall -Wextra -g -pipe -O3 -I../../
+CPPFLAGS += -Wall -Wextra -g -pipe -O3 -I../../
+CXXFLAGS += -std=gnu++0x
 LINKFLAGS += -static-libgcc -static-libstdc++ -g -O3 -shared -Wl,--add-stdcall-alias
 
-VPATH = ../../pluginsdk:../../src
+VPATH = ../../
 
 OUTPUT_DIR = build
 OUTPUT_OPTION = -o $(OUTPUT_DIR)/$@
 
 OBJS = \
-	Config.o \
-	Connections.o \
-	Core.o \
-	Hooks.o \
-	Hubs.o \
-	Logger.o \
-	Queue.o \
-	Tagger.o \
-	UI.o \
-	Util.o \
-	main.o \
-	Plugin.o \
-	stdafx.o
+	pluginsdk/Config.o \
+	pluginsdk/Connections.o \
+	pluginsdk/Core.o \
+	pluginsdk/Hooks.o \
+	pluginsdk/Hubs.o \
+	pluginsdk/Logger.o \
+	pluginsdk/Queue.o \
+	pluginsdk/Tagger.o \
+	pluginsdk/UI.o \
+	pluginsdk/Util.o \
+	src/main.o \
+	src/Plugin.o \
+	src/stdafx.o
 
 ifeq ($(OS), Windows_NT)
-	OBJS += resource.o
+	CPPFLAGS += -D_WIN32_WINNT=0x502 -DWINVER=0x502 -D_WIN32_IE=0x600 \
+				-DNOMINMAX -DSTRICT -DWIN32_LEAN_AND_MEAN \
+				-DUNICODE -D_UNICODE
+	OBJS += src/resource.o
 	LIBEXT = .dll
 else
 	LIBEXT = .so
@@ -40,9 +43,9 @@
 	cd $(OUTPUT_DIR); $(CXX) $(LINKFLAGS) -o $@$(LIBEXT) $^
 
 ensure-dirs:
-	mkdir -p $(OUTPUT_DIR)
+	mkdir -p $(OUTPUT_DIR)/pluginsdk $(OUTPUT_DIR)/src
 
-resource.o: resource.rc
+src/resource.o:
 	windres ../../src/resource.rc $(OUTPUT_OPTION)
 
 clear: