diff --git a/build/cocos2d-win32.vc2012.sln b/build/cocos2d-win32.vc2012.sln
index dc713f721a..055f2033f6 100644
--- a/build/cocos2d-win32.vc2012.sln
+++ b/build/cocos2d-win32.vc2012.sln
@@ -1,9 +1,12 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Express 2012 for Windows Desktop
+# Visual Studio 2012
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAudio", "..\cocos\audio\proj.win32\CocosDenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\cocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
+ ProjectSection(ProjectDependencies) = postProject
+ {207BC7A9-CCF1-4F2F-A04D-45F72242AE25} = {207BC7A9-CCF1-4F2F-A04D-45F72242AE25}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libBox2D", "..\external\Box2D\proj.win32\Box2D.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}"
EndProject
diff --git a/cocos/2d/cocos2d.def b/cocos/2d/cocos2d.def
new file mode 100644
index 0000000000..3cad80013e
--- /dev/null
+++ b/cocos/2d/cocos2d.def
@@ -0,0 +1,2 @@
+
+LIBRARY
diff --git a/cocos/2d/cocos2d.vcxproj b/cocos/2d/cocos2d.vcxproj
index 9e8280f3a4..a34ea31514 100644
--- a/cocos/2d/cocos2d.vcxproj
+++ b/cocos/2d/cocos2d.vcxproj
@@ -18,7 +18,7 @@
- StaticLibrary
+ DynamicLibrary
Unicode
v100
v110
@@ -27,7 +27,7 @@
v120_xp
- StaticLibrary
+ DynamicLibrary
Unicode
v100
v110
@@ -78,7 +78,7 @@
Disabled
$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external;%(AdditionalIncludeDirectories)
- WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ WIN32;_USRDLL;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
false
EnableFastChecks
MultiThreadedDebugDLL
@@ -114,6 +114,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
Windows
$(TargetDir)$(TargetName).lib
MachineX86
+ cocos2d.def
+ libchipmunk.lib;%(AdditionalDependencies)
@@ -127,7 +129,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external;%(AdditionalIncludeDirectories)
- WIN32;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
+ WIN32;_USRDLL;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)
MultiThreadedDLL
@@ -165,6 +167,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
true
$(TargetDir)$(TargetName).lib
MachineX86
+ cocos2d.def
@@ -564,6 +567,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
+
diff --git a/cocos/2d/cocos2d.vcxproj.filters b/cocos/2d/cocos2d.vcxproj.filters
index af367c9ab0..2f64cdad7c 100644
--- a/cocos/2d/cocos2d.vcxproj.filters
+++ b/cocos/2d/cocos2d.vcxproj.filters
@@ -403,9 +403,6 @@
base
-
- base
-
base
@@ -1224,5 +1221,6 @@
3d
+
\ No newline at end of file
diff --git a/cocos/platform/win32/CCPlatformDefine.h b/cocos/platform/win32/CCPlatformDefine.h
index f2cb37367f..354cbf80a7 100644
--- a/cocos/platform/win32/CCPlatformDefine.h
+++ b/cocos/platform/win32/CCPlatformDefine.h
@@ -32,13 +32,11 @@ THE SOFTWARE.
#include
#endif
-//#if defined(_USRDLL)
-// #define CC_DLL __declspec(dllexport)
-//#else /* use a DLL library */
-// #define CC_DLL __declspec(dllimport)
-//#endif
-
-#define CC_DLL
+#if defined(_USRDLL)
+ #define CC_DLL __declspec(dllexport)
+#else /* use a DLL library */
+ #define CC_DLL __declspec(dllimport)
+#endif
#include