← Back to team overview

linuxdcpp-team team mailing list archive

[Branch ~dcplusplus-team/dcpp-plugin-sdk-cpp/DescriptionRotator] Rev 39: merge

 

Merge authors:
  poy (poy)
------------------------------------------------------------
revno: 39 [merge]
committer: poy <poy@xxxxxxxxxx>
branch nick: DescriptionRotator
timestamp: Tue 2013-06-18 23:42:32 +0200
message:
  merge
modified:
  projects/make/Makefile


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

Your team Dcplusplus-team is subscribed to branch lp:~dcplusplus-team/dcpp-plugin-sdk-cpp/DescriptionRotator.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcpp-plugin-sdk-cpp/DescriptionRotator/+edit-subscription
=== modified file 'projects/make/Makefile'
--- projects/make/Makefile	2013-06-18 21:20:58 +0000
+++ projects/make/Makefile	2013-06-18 21:42:32 +0000
@@ -114,8 +114,14 @@
 	PDB =
 else
 	PDB := $(OUTPUT_DIR)/$(TARGET).pdb
-	RCFLAGS := -DPLUGIN_FILE_NAME="\\\"$(TARGET)\\\"" \
-		-DPLUGIN_FILE_NAME_EXT="\\\"$(TARGET)$(LIBEXT)\\\""
+
+	ifeq ($(findstring Cygwin, $(SHELL)),)
+		RCFLAGS := -DPLUGIN_FILE_NAME="^\\"$(TARGET)\\"" \
+			-DPLUGIN_FILE_NAME_EXT="^\\"$(TARGET)$(LIBEXT)\\""
+	else
+		RCFLAGS := -DPLUGIN_FILE_NAME="\\\"$(TARGET)\\\"" \
+			-DPLUGIN_FILE_NAME_EXT="\\\"$(TARGET)$(LIBEXT)\\\""
+	endif
 endif
 
 TARGET := $(OUTPUT_DIR)/$(TARGET)$(LIBEXT)