diff --git a/tools/simulator/frameworks/runtime-src/Classes/AppDelegate.cpp b/tools/simulator/frameworks/runtime-src/Classes/AppDelegate.cpp
index b868e54e6c..57ef8d1f3a 100644
--- a/tools/simulator/frameworks/runtime-src/Classes/AppDelegate.cpp
+++ b/tools/simulator/frameworks/runtime-src/Classes/AppDelegate.cpp
@@ -10,7 +10,7 @@
#include "cocostudio/CocoStudio.h"
#if ((CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_MAC))
-#include "service/DeviceEx.h"
+#include "DeviceEx.h"
#include "network/CCHTTPRequest.h"
#endif
diff --git a/tools/simulator/frameworks/runtime-src/Classes/runtime/Runtime.cpp b/tools/simulator/frameworks/runtime-src/Classes/runtime/Runtime.cpp
index d7d2dd95a3..dc8a3da939 100644
--- a/tools/simulator/frameworks/runtime-src/Classes/runtime/Runtime.cpp
+++ b/tools/simulator/frameworks/runtime-src/Classes/runtime/Runtime.cpp
@@ -329,5 +329,9 @@ void luaScriptLoader(std::string strDebugArg)
void resetDesignResolution()
{
cocos2d::Size size = ConfigParser::getInstance()->getInitViewSize();
+ if (!ConfigParser::getInstance()->isLanscape())
+ {
+ std::swap(size.width, size.height);
+ }
Director::getInstance()->getOpenGLView()->setDesignResolutionSize(size.width, size.height, ResolutionPolicy::EXACT_FIT);
}
diff --git a/tools/simulator/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm b/tools/simulator/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm
index 0e91ba0a7b..98e67c2327 100644
--- a/tools/simulator/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm
+++ b/tools/simulator/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm
@@ -40,8 +40,8 @@
#include "CodeIDESupport.h"
#include "platform/mac/PlayerMac.h"
-#include "service/AppEvent.h"
-#include "service/AppLang.h"
+#include "AppEvent.h"
+#include "AppLang.h"
#if (GLFW_VERSION_MAJOR >= 3) && (GLFW_VERSION_MINOR >= 1)
diff --git a/tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj b/tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
index 9f17af13a8..1fc4f13549 100644
--- a/tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
+++ b/tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
@@ -77,7 +77,7 @@
521A8E7119F0C3D200D177D7 /* Default-736h@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 521A8E6F19F0C3D200D177D7 /* Default-736h@3x.png */; };
9F7214271A5C1E4C00DAED06 /* libluacocos2d Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F7213E01A5C19ED00DAED06 /* libluacocos2d Mac.a */; };
9F7214281A5C1E5B00DAED06 /* libluacocos2d iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9F7213E21A5C19ED00DAED06 /* libluacocos2d iOS.a */; };
- 9FD6FC0B1A5D27870028EDC6 /* liblibsimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD6FC081A5D26580028EDC6 /* liblibsimulator.a */; };
+ 9FD6FC0B1A5D27870028EDC6 /* liblibsimulator.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD6FC081A5D26580028EDC6 /* liblibsimulator.a */; settings = {ATTRIBUTES = (Required, ); }; };
9FD6FC0C1A5D278E0028EDC6 /* liblibsimulator_iOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9FD6FC0A1A5D26580028EDC6 /* liblibsimulator_iOS.a */; };
9FD6FC721A5D2A820028EDC6 /* ConsoleWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 9FD6FC6F1A5D2A820028EDC6 /* ConsoleWindow.xib */; };
9FD6FC731A5D2A820028EDC6 /* ConsoleWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 9FD6FC711A5D2A820028EDC6 /* ConsoleWindowController.m */; };
@@ -185,6 +185,20 @@
remoteGlobalIDString = 9F7214851A5C28BA00DAED06;
remoteInfo = libsimulator_iOS;
};
+ 9FF504CB1A5EB19500AFDA55 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 9FD6FC021A5D26580028EDC6 /* libsimulator.xcodeproj */;
+ proxyType = 1;
+ remoteGlobalIDString = 9F7214841A5C28BA00DAED06;
+ remoteInfo = libsimulator_iOS;
+ };
+ 9FF504CF1A5EB19900AFDA55 /* PBXContainerItemProxy */ = {
+ isa = PBXContainerItemProxy;
+ containerPortal = 9FD6FC021A5D26580028EDC6 /* libsimulator.xcodeproj */;
+ proxyType = 1;
+ remoteGlobalIDString = 9F7214341A5C271F00DAED06;
+ remoteInfo = libsimulator;
+ };
C0A2F04018975FF80072A7AB /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 15A8A4031834BDA200142BE0 /* cocos2d_libs.xcodeproj */;
@@ -650,6 +664,7 @@
buildRules = (
);
dependencies = (
+ 9FF504D01A5EB19900AFDA55 /* PBXTargetDependency */,
9F7214221A5C1D3A00DAED06 /* PBXTargetDependency */,
C0A2F04118975FF80072A7AB /* PBXTargetDependency */,
);
@@ -669,6 +684,7 @@
buildRules = (
);
dependencies = (
+ 9FF504CC1A5EB19500AFDA55 /* PBXTargetDependency */,
9F7214261A5C1D4200DAED06 /* PBXTargetDependency */,
15D1F3091994BBCA00302043 /* PBXTargetDependency */,
);
@@ -903,6 +919,16 @@
name = "libluacocos2d iOS";
targetProxy = 9F7214251A5C1D4200DAED06 /* PBXContainerItemProxy */;
};
+ 9FF504CC1A5EB19500AFDA55 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ name = libsimulator_iOS;
+ targetProxy = 9FF504CB1A5EB19500AFDA55 /* PBXContainerItemProxy */;
+ };
+ 9FF504D01A5EB19900AFDA55 /* PBXTargetDependency */ = {
+ isa = PBXTargetDependency;
+ name = libsimulator;
+ targetProxy = 9FF504CF1A5EB19900AFDA55 /* PBXContainerItemProxy */;
+ };
C0A2F04118975FF80072A7AB /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = "cocos2dx Mac";
@@ -943,7 +969,6 @@
"$(SRCROOT)/../Classes/protobuf-lite",
"$(SRCROOT)/../Classes",
"$(SRCROOT)/../../../libsimulator/lib",
- "$(SRCROOT)/../../../libsimulator/lib/service",
);
INFOPLIST_FILE = mac/Info.plist;
LIBRARY_SEARCH_PATHS = "";
@@ -978,7 +1003,6 @@
"$(SRCROOT)/../Classes/protobuf-lite",
"$(SRCROOT)/../Classes",
"$(SRCROOT)/../../../libsimulator/lib",
- "$(SRCROOT)/../../../libsimulator/lib/service",
);
INFOPLIST_FILE = mac/Info.plist;
LIBRARY_SEARCH_PATHS = "";
diff --git a/tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj b/tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj
index 5b76376eb0..30b67dbc30 100644
--- a/tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj
+++ b/tools/simulator/frameworks/runtime-src/proj.win32/simulator.vcxproj
@@ -68,7 +68,7 @@
- $(ProjectDir)..\Classes;$(ProjectDir)..\Classes\runtime;$(ProjectDir)..\Classes\protobuf-lite;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)tools\simulator\libsimulator\lib\service;$(EngineRoot)tools\simulator\libsimulator\lib;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)
+ $(ProjectDir)..\Classes;$(ProjectDir)..\Classes\runtime;$(ProjectDir)..\Classes\protobuf-lite;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)tools\simulator\libsimulator\lib;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)
NotUsing
Level3
MultiThreadedDebugDLL
@@ -124,7 +124,7 @@ xcopy /Y /Q "$(ProjectDir)..\Classes\lang" "$(ProjectDir)..\..\..\runtime\win32\
- $(ProjectDir)..\Classes;$(ProjectDir)..\Classes\service;$(ProjectDir)..\Classes\runtime;$(ProjectDir)..\Classes\protobuf-lite;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\curl\include\win32;$(EngineRoot)tools\simulator\libsimulator\lib;$(EngineRoot);%(AdditionalIncludeDirectories)
+ $(ProjectDir)..\Classes;$(ProjectDir)..\Classes\runtime;$(ProjectDir)..\Classes\protobuf-lite;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)extensions;$(EngineRoot)external\curl\include\win32;$(EngineRoot)tools\simulator\libsimulator\lib;$(EngineRoot);%(AdditionalIncludeDirectories)
Level3
diff --git a/tools/simulator/libsimulator/lib/service/AppEvent.cpp b/tools/simulator/libsimulator/lib/AppEvent.cpp
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/AppEvent.cpp
rename to tools/simulator/libsimulator/lib/AppEvent.cpp
diff --git a/tools/simulator/libsimulator/lib/service/AppEvent.h b/tools/simulator/libsimulator/lib/AppEvent.h
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/AppEvent.h
rename to tools/simulator/libsimulator/lib/AppEvent.h
diff --git a/tools/simulator/libsimulator/lib/service/AppLang.cpp b/tools/simulator/libsimulator/lib/AppLang.cpp
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/AppLang.cpp
rename to tools/simulator/libsimulator/lib/AppLang.cpp
diff --git a/tools/simulator/libsimulator/lib/service/AppLang.h b/tools/simulator/libsimulator/lib/AppLang.h
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/AppLang.h
rename to tools/simulator/libsimulator/lib/AppLang.h
diff --git a/tools/simulator/libsimulator/lib/service/DeviceEx.h b/tools/simulator/libsimulator/lib/DeviceEx.h
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/DeviceEx.h
rename to tools/simulator/libsimulator/lib/DeviceEx.h
diff --git a/tools/simulator/libsimulator/lib/service/PlayerEditBoxServiceProtocol.h b/tools/simulator/libsimulator/lib/PlayerEditBoxServiceProtocol.h
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/PlayerEditBoxServiceProtocol.h
rename to tools/simulator/libsimulator/lib/PlayerEditBoxServiceProtocol.h
diff --git a/tools/simulator/libsimulator/lib/service/PlayerFileDialogServiceProtocol.h b/tools/simulator/libsimulator/lib/PlayerFileDialogServiceProtocol.h
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/PlayerFileDialogServiceProtocol.h
rename to tools/simulator/libsimulator/lib/PlayerFileDialogServiceProtocol.h
diff --git a/tools/simulator/libsimulator/lib/service/PlayerMacros.h b/tools/simulator/libsimulator/lib/PlayerMacros.h
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/PlayerMacros.h
rename to tools/simulator/libsimulator/lib/PlayerMacros.h
diff --git a/tools/simulator/libsimulator/lib/service/PlayerMenuServiceProtocol.cpp b/tools/simulator/libsimulator/lib/PlayerMenuServiceProtocol.cpp
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/PlayerMenuServiceProtocol.cpp
rename to tools/simulator/libsimulator/lib/PlayerMenuServiceProtocol.cpp
diff --git a/tools/simulator/libsimulator/lib/service/PlayerMenuServiceProtocol.h b/tools/simulator/libsimulator/lib/PlayerMenuServiceProtocol.h
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/PlayerMenuServiceProtocol.h
rename to tools/simulator/libsimulator/lib/PlayerMenuServiceProtocol.h
diff --git a/tools/simulator/libsimulator/lib/service/PlayerMessageBoxServiceProtocol.h b/tools/simulator/libsimulator/lib/PlayerMessageBoxServiceProtocol.h
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/PlayerMessageBoxServiceProtocol.h
rename to tools/simulator/libsimulator/lib/PlayerMessageBoxServiceProtocol.h
diff --git a/tools/simulator/libsimulator/lib/service/PlayerProtocol.cpp b/tools/simulator/libsimulator/lib/PlayerProtocol.cpp
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/PlayerProtocol.cpp
rename to tools/simulator/libsimulator/lib/PlayerProtocol.cpp
diff --git a/tools/simulator/libsimulator/lib/service/PlayerProtocol.h b/tools/simulator/libsimulator/lib/PlayerProtocol.h
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/PlayerProtocol.h
rename to tools/simulator/libsimulator/lib/PlayerProtocol.h
diff --git a/tools/simulator/libsimulator/lib/service/PlayerServiceProtocol.cpp b/tools/simulator/libsimulator/lib/PlayerServiceProtocol.cpp
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/PlayerServiceProtocol.cpp
rename to tools/simulator/libsimulator/lib/PlayerServiceProtocol.cpp
diff --git a/tools/simulator/libsimulator/lib/service/PlayerServiceProtocol.h b/tools/simulator/libsimulator/lib/PlayerServiceProtocol.h
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/PlayerServiceProtocol.h
rename to tools/simulator/libsimulator/lib/PlayerServiceProtocol.h
diff --git a/tools/simulator/libsimulator/lib/service/PlayerSettings.cpp b/tools/simulator/libsimulator/lib/PlayerSettings.cpp
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/PlayerSettings.cpp
rename to tools/simulator/libsimulator/lib/PlayerSettings.cpp
diff --git a/tools/simulator/libsimulator/lib/service/PlayerSettings.h b/tools/simulator/libsimulator/lib/PlayerSettings.h
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/PlayerSettings.h
rename to tools/simulator/libsimulator/lib/PlayerSettings.h
diff --git a/tools/simulator/libsimulator/lib/service/PlayerTaskServiceProtocol.cpp b/tools/simulator/libsimulator/lib/PlayerTaskServiceProtocol.cpp
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/PlayerTaskServiceProtocol.cpp
rename to tools/simulator/libsimulator/lib/PlayerTaskServiceProtocol.cpp
diff --git a/tools/simulator/libsimulator/lib/service/PlayerTaskServiceProtocol.h b/tools/simulator/libsimulator/lib/PlayerTaskServiceProtocol.h
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/PlayerTaskServiceProtocol.h
rename to tools/simulator/libsimulator/lib/PlayerTaskServiceProtocol.h
diff --git a/tools/simulator/libsimulator/lib/service/PlayerUtils.cpp b/tools/simulator/libsimulator/lib/PlayerUtils.cpp
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/PlayerUtils.cpp
rename to tools/simulator/libsimulator/lib/PlayerUtils.cpp
diff --git a/tools/simulator/libsimulator/lib/service/PlayerUtils.h b/tools/simulator/libsimulator/lib/PlayerUtils.h
similarity index 100%
rename from tools/simulator/libsimulator/lib/service/PlayerUtils.h
rename to tools/simulator/libsimulator/lib/PlayerUtils.h
diff --git a/tools/simulator/libsimulator/proj.ios_mac/libsimulator.xcodeproj/project.pbxproj b/tools/simulator/libsimulator/proj.ios_mac/libsimulator.xcodeproj/project.pbxproj
index 49b4152196..053791b637 100644
--- a/tools/simulator/libsimulator/proj.ios_mac/libsimulator.xcodeproj/project.pbxproj
+++ b/tools/simulator/libsimulator/proj.ios_mac/libsimulator.xcodeproj/project.pbxproj
@@ -15,27 +15,6 @@
9FD6FC361A5D281D0028EDC6 /* ProjectConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FD6FC181A5D281D0028EDC6 /* ProjectConfig.h */; };
9FD6FC371A5D281D0028EDC6 /* SimulatorConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FD6FC191A5D281D0028EDC6 /* SimulatorConfig.cpp */; };
9FD6FC381A5D281D0028EDC6 /* SimulatorConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FD6FC1A1A5D281D0028EDC6 /* SimulatorConfig.h */; };
- 9FD6FC391A5D281D0028EDC6 /* AppEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FD6FC1C1A5D281D0028EDC6 /* AppEvent.cpp */; };
- 9FD6FC3A1A5D281D0028EDC6 /* AppEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FD6FC1D1A5D281D0028EDC6 /* AppEvent.h */; };
- 9FD6FC3B1A5D281D0028EDC6 /* AppLang.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FD6FC1E1A5D281D0028EDC6 /* AppLang.cpp */; };
- 9FD6FC3C1A5D281D0028EDC6 /* AppLang.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FD6FC1F1A5D281D0028EDC6 /* AppLang.h */; };
- 9FD6FC3D1A5D281D0028EDC6 /* DeviceEx.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FD6FC201A5D281D0028EDC6 /* DeviceEx.h */; };
- 9FD6FC3E1A5D281D0028EDC6 /* PlayerEditBoxServiceProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FD6FC211A5D281D0028EDC6 /* PlayerEditBoxServiceProtocol.h */; };
- 9FD6FC3F1A5D281D0028EDC6 /* PlayerFileDialogServiceProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FD6FC221A5D281D0028EDC6 /* PlayerFileDialogServiceProtocol.h */; };
- 9FD6FC401A5D281D0028EDC6 /* PlayerMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FD6FC231A5D281D0028EDC6 /* PlayerMacros.h */; };
- 9FD6FC411A5D281D0028EDC6 /* PlayerMenuServiceProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FD6FC241A5D281D0028EDC6 /* PlayerMenuServiceProtocol.cpp */; };
- 9FD6FC421A5D281D0028EDC6 /* PlayerMenuServiceProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FD6FC251A5D281D0028EDC6 /* PlayerMenuServiceProtocol.h */; };
- 9FD6FC431A5D281D0028EDC6 /* PlayerMessageBoxServiceProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FD6FC261A5D281D0028EDC6 /* PlayerMessageBoxServiceProtocol.h */; };
- 9FD6FC441A5D281D0028EDC6 /* PlayerProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FD6FC271A5D281D0028EDC6 /* PlayerProtocol.cpp */; };
- 9FD6FC451A5D281D0028EDC6 /* PlayerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FD6FC281A5D281D0028EDC6 /* PlayerProtocol.h */; };
- 9FD6FC461A5D281D0028EDC6 /* PlayerServiceProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FD6FC291A5D281D0028EDC6 /* PlayerServiceProtocol.cpp */; };
- 9FD6FC471A5D281D0028EDC6 /* PlayerServiceProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FD6FC2A1A5D281D0028EDC6 /* PlayerServiceProtocol.h */; };
- 9FD6FC481A5D281D0028EDC6 /* PlayerSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FD6FC2B1A5D281D0028EDC6 /* PlayerSettings.cpp */; };
- 9FD6FC491A5D281D0028EDC6 /* PlayerSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FD6FC2C1A5D281D0028EDC6 /* PlayerSettings.h */; };
- 9FD6FC4A1A5D281D0028EDC6 /* PlayerTaskServiceProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FD6FC2D1A5D281D0028EDC6 /* PlayerTaskServiceProtocol.cpp */; };
- 9FD6FC4B1A5D281D0028EDC6 /* PlayerTaskServiceProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FD6FC2E1A5D281D0028EDC6 /* PlayerTaskServiceProtocol.h */; };
- 9FD6FC4C1A5D281D0028EDC6 /* PlayerUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FD6FC2F1A5D281D0028EDC6 /* PlayerUtils.cpp */; };
- 9FD6FC4D1A5D281D0028EDC6 /* PlayerUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FD6FC301A5D281D0028EDC6 /* PlayerUtils.h */; };
9FD6FC4E1A5D28260028EDC6 /* ProjectConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FD6FC171A5D281D0028EDC6 /* ProjectConfig.cpp */; };
9FD6FC4F1A5D28260028EDC6 /* SimulatorConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FD6FC191A5D281D0028EDC6 /* SimulatorConfig.cpp */; };
9FD6FC601A5D2A380028EDC6 /* DeviceEx-mac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9FD6FC501A5D2A380028EDC6 /* DeviceEx-mac.mm */; };
@@ -53,6 +32,27 @@
9FD6FC6C1A5D2A380028EDC6 /* PlayerMessageBoxServiceMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9FD6FC5D1A5D2A380028EDC6 /* PlayerMessageBoxServiceMac.mm */; };
9FD6FC6D1A5D2A380028EDC6 /* PlayerTaskServiceMac.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FD6FC5E1A5D2A380028EDC6 /* PlayerTaskServiceMac.h */; };
9FD6FC6E1A5D2A380028EDC6 /* PlayerTaskServiceMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 9FD6FC5F1A5D2A380028EDC6 /* PlayerTaskServiceMac.mm */; };
+ 9FF504AD1A5EA75D00AFDA55 /* AppEvent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FF504981A5EA75D00AFDA55 /* AppEvent.cpp */; };
+ 9FF504AE1A5EA75D00AFDA55 /* AppEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FF504991A5EA75D00AFDA55 /* AppEvent.h */; };
+ 9FF504AF1A5EA75D00AFDA55 /* AppLang.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FF5049A1A5EA75D00AFDA55 /* AppLang.cpp */; };
+ 9FF504B01A5EA75D00AFDA55 /* AppLang.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FF5049B1A5EA75D00AFDA55 /* AppLang.h */; };
+ 9FF504B11A5EA75D00AFDA55 /* DeviceEx.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FF5049C1A5EA75D00AFDA55 /* DeviceEx.h */; };
+ 9FF504B21A5EA75D00AFDA55 /* PlayerEditBoxServiceProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FF5049D1A5EA75D00AFDA55 /* PlayerEditBoxServiceProtocol.h */; };
+ 9FF504B31A5EA75D00AFDA55 /* PlayerFileDialogServiceProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FF5049E1A5EA75D00AFDA55 /* PlayerFileDialogServiceProtocol.h */; };
+ 9FF504B41A5EA75D00AFDA55 /* PlayerMacros.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FF5049F1A5EA75D00AFDA55 /* PlayerMacros.h */; };
+ 9FF504B51A5EA75D00AFDA55 /* PlayerMenuServiceProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FF504A01A5EA75D00AFDA55 /* PlayerMenuServiceProtocol.cpp */; };
+ 9FF504B61A5EA75D00AFDA55 /* PlayerMenuServiceProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FF504A11A5EA75D00AFDA55 /* PlayerMenuServiceProtocol.h */; };
+ 9FF504B71A5EA75D00AFDA55 /* PlayerMessageBoxServiceProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FF504A21A5EA75D00AFDA55 /* PlayerMessageBoxServiceProtocol.h */; };
+ 9FF504B81A5EA75D00AFDA55 /* PlayerProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FF504A31A5EA75D00AFDA55 /* PlayerProtocol.cpp */; };
+ 9FF504B91A5EA75D00AFDA55 /* PlayerProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FF504A41A5EA75D00AFDA55 /* PlayerProtocol.h */; };
+ 9FF504BA1A5EA75D00AFDA55 /* PlayerServiceProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FF504A51A5EA75D00AFDA55 /* PlayerServiceProtocol.cpp */; };
+ 9FF504BB1A5EA75D00AFDA55 /* PlayerServiceProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FF504A61A5EA75D00AFDA55 /* PlayerServiceProtocol.h */; };
+ 9FF504BC1A5EA75D00AFDA55 /* PlayerSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FF504A71A5EA75D00AFDA55 /* PlayerSettings.cpp */; };
+ 9FF504BD1A5EA75D00AFDA55 /* PlayerSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FF504A81A5EA75D00AFDA55 /* PlayerSettings.h */; };
+ 9FF504BE1A5EA75D00AFDA55 /* PlayerTaskServiceProtocol.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FF504A91A5EA75D00AFDA55 /* PlayerTaskServiceProtocol.cpp */; };
+ 9FF504BF1A5EA75D00AFDA55 /* PlayerTaskServiceProtocol.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FF504AA1A5EA75D00AFDA55 /* PlayerTaskServiceProtocol.h */; };
+ 9FF504C01A5EA75D00AFDA55 /* PlayerUtils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9FF504AB1A5EA75D00AFDA55 /* PlayerUtils.cpp */; };
+ 9FF504C11A5EA75D00AFDA55 /* PlayerUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = 9FF504AC1A5EA75D00AFDA55 /* PlayerUtils.h */; };
/* End PBXBuildFile section */
/* Begin PBXCopyFilesBuildPhase section */
@@ -78,27 +78,6 @@
9FD6FC181A5D281D0028EDC6 /* ProjectConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ProjectConfig.h; sourceTree = ""; };
9FD6FC191A5D281D0028EDC6 /* SimulatorConfig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SimulatorConfig.cpp; sourceTree = ""; };
9FD6FC1A1A5D281D0028EDC6 /* SimulatorConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SimulatorConfig.h; sourceTree = ""; };
- 9FD6FC1C1A5D281D0028EDC6 /* AppEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppEvent.cpp; sourceTree = ""; };
- 9FD6FC1D1A5D281D0028EDC6 /* AppEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppEvent.h; sourceTree = ""; };
- 9FD6FC1E1A5D281D0028EDC6 /* AppLang.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppLang.cpp; sourceTree = ""; };
- 9FD6FC1F1A5D281D0028EDC6 /* AppLang.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppLang.h; sourceTree = ""; };
- 9FD6FC201A5D281D0028EDC6 /* DeviceEx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceEx.h; sourceTree = ""; };
- 9FD6FC211A5D281D0028EDC6 /* PlayerEditBoxServiceProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerEditBoxServiceProtocol.h; sourceTree = ""; };
- 9FD6FC221A5D281D0028EDC6 /* PlayerFileDialogServiceProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerFileDialogServiceProtocol.h; sourceTree = ""; };
- 9FD6FC231A5D281D0028EDC6 /* PlayerMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerMacros.h; sourceTree = ""; };
- 9FD6FC241A5D281D0028EDC6 /* PlayerMenuServiceProtocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayerMenuServiceProtocol.cpp; sourceTree = ""; };
- 9FD6FC251A5D281D0028EDC6 /* PlayerMenuServiceProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerMenuServiceProtocol.h; sourceTree = ""; };
- 9FD6FC261A5D281D0028EDC6 /* PlayerMessageBoxServiceProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerMessageBoxServiceProtocol.h; sourceTree = ""; };
- 9FD6FC271A5D281D0028EDC6 /* PlayerProtocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayerProtocol.cpp; sourceTree = ""; };
- 9FD6FC281A5D281D0028EDC6 /* PlayerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerProtocol.h; sourceTree = ""; };
- 9FD6FC291A5D281D0028EDC6 /* PlayerServiceProtocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayerServiceProtocol.cpp; sourceTree = ""; };
- 9FD6FC2A1A5D281D0028EDC6 /* PlayerServiceProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerServiceProtocol.h; sourceTree = ""; };
- 9FD6FC2B1A5D281D0028EDC6 /* PlayerSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayerSettings.cpp; sourceTree = ""; };
- 9FD6FC2C1A5D281D0028EDC6 /* PlayerSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerSettings.h; sourceTree = ""; };
- 9FD6FC2D1A5D281D0028EDC6 /* PlayerTaskServiceProtocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayerTaskServiceProtocol.cpp; sourceTree = ""; };
- 9FD6FC2E1A5D281D0028EDC6 /* PlayerTaskServiceProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerTaskServiceProtocol.h; sourceTree = ""; };
- 9FD6FC2F1A5D281D0028EDC6 /* PlayerUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayerUtils.cpp; sourceTree = ""; };
- 9FD6FC301A5D281D0028EDC6 /* PlayerUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerUtils.h; sourceTree = ""; };
9FD6FC501A5D2A380028EDC6 /* DeviceEx-mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "DeviceEx-mac.mm"; sourceTree = ""; };
9FD6FC521A5D2A380028EDC6 /* OpenUDIDMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpenUDIDMac.h; sourceTree = ""; };
9FD6FC531A5D2A380028EDC6 /* OpenUDIDMac.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OpenUDIDMac.m; sourceTree = ""; };
@@ -114,6 +93,27 @@
9FD6FC5D1A5D2A380028EDC6 /* PlayerMessageBoxServiceMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlayerMessageBoxServiceMac.mm; sourceTree = ""; };
9FD6FC5E1A5D2A380028EDC6 /* PlayerTaskServiceMac.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerTaskServiceMac.h; sourceTree = ""; };
9FD6FC5F1A5D2A380028EDC6 /* PlayerTaskServiceMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PlayerTaskServiceMac.mm; sourceTree = ""; };
+ 9FF504981A5EA75D00AFDA55 /* AppEvent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppEvent.cpp; sourceTree = ""; };
+ 9FF504991A5EA75D00AFDA55 /* AppEvent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppEvent.h; sourceTree = ""; };
+ 9FF5049A1A5EA75D00AFDA55 /* AppLang.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AppLang.cpp; sourceTree = ""; };
+ 9FF5049B1A5EA75D00AFDA55 /* AppLang.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppLang.h; sourceTree = ""; };
+ 9FF5049C1A5EA75D00AFDA55 /* DeviceEx.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DeviceEx.h; sourceTree = ""; };
+ 9FF5049D1A5EA75D00AFDA55 /* PlayerEditBoxServiceProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerEditBoxServiceProtocol.h; sourceTree = ""; };
+ 9FF5049E1A5EA75D00AFDA55 /* PlayerFileDialogServiceProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerFileDialogServiceProtocol.h; sourceTree = ""; };
+ 9FF5049F1A5EA75D00AFDA55 /* PlayerMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerMacros.h; sourceTree = ""; };
+ 9FF504A01A5EA75D00AFDA55 /* PlayerMenuServiceProtocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayerMenuServiceProtocol.cpp; sourceTree = ""; };
+ 9FF504A11A5EA75D00AFDA55 /* PlayerMenuServiceProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerMenuServiceProtocol.h; sourceTree = ""; };
+ 9FF504A21A5EA75D00AFDA55 /* PlayerMessageBoxServiceProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerMessageBoxServiceProtocol.h; sourceTree = ""; };
+ 9FF504A31A5EA75D00AFDA55 /* PlayerProtocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayerProtocol.cpp; sourceTree = ""; };
+ 9FF504A41A5EA75D00AFDA55 /* PlayerProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerProtocol.h; sourceTree = ""; };
+ 9FF504A51A5EA75D00AFDA55 /* PlayerServiceProtocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayerServiceProtocol.cpp; sourceTree = ""; };
+ 9FF504A61A5EA75D00AFDA55 /* PlayerServiceProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerServiceProtocol.h; sourceTree = ""; };
+ 9FF504A71A5EA75D00AFDA55 /* PlayerSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayerSettings.cpp; sourceTree = ""; };
+ 9FF504A81A5EA75D00AFDA55 /* PlayerSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerSettings.h; sourceTree = ""; };
+ 9FF504A91A5EA75D00AFDA55 /* PlayerTaskServiceProtocol.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayerTaskServiceProtocol.cpp; sourceTree = ""; };
+ 9FF504AA1A5EA75D00AFDA55 /* PlayerTaskServiceProtocol.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerTaskServiceProtocol.h; sourceTree = ""; };
+ 9FF504AB1A5EA75D00AFDA55 /* PlayerUtils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PlayerUtils.cpp; sourceTree = ""; };
+ 9FF504AC1A5EA75D00AFDA55 /* PlayerUtils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PlayerUtils.h; sourceTree = ""; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -154,11 +154,31 @@
9FD6FC0D1A5D281D0028EDC6 /* lib */ = {
isa = PBXGroup;
children = (
+ 9FF504981A5EA75D00AFDA55 /* AppEvent.cpp */,
+ 9FF504991A5EA75D00AFDA55 /* AppEvent.h */,
+ 9FF5049A1A5EA75D00AFDA55 /* AppLang.cpp */,
+ 9FF5049B1A5EA75D00AFDA55 /* AppLang.h */,
+ 9FF5049C1A5EA75D00AFDA55 /* DeviceEx.h */,
+ 9FF5049D1A5EA75D00AFDA55 /* PlayerEditBoxServiceProtocol.h */,
+ 9FF5049E1A5EA75D00AFDA55 /* PlayerFileDialogServiceProtocol.h */,
+ 9FF5049F1A5EA75D00AFDA55 /* PlayerMacros.h */,
+ 9FF504A01A5EA75D00AFDA55 /* PlayerMenuServiceProtocol.cpp */,
+ 9FF504A11A5EA75D00AFDA55 /* PlayerMenuServiceProtocol.h */,
+ 9FF504A21A5EA75D00AFDA55 /* PlayerMessageBoxServiceProtocol.h */,
+ 9FF504A31A5EA75D00AFDA55 /* PlayerProtocol.cpp */,
+ 9FF504A41A5EA75D00AFDA55 /* PlayerProtocol.h */,
+ 9FF504A51A5EA75D00AFDA55 /* PlayerServiceProtocol.cpp */,
+ 9FF504A61A5EA75D00AFDA55 /* PlayerServiceProtocol.h */,
+ 9FF504A71A5EA75D00AFDA55 /* PlayerSettings.cpp */,
+ 9FF504A81A5EA75D00AFDA55 /* PlayerSettings.h */,
+ 9FF504A91A5EA75D00AFDA55 /* PlayerTaskServiceProtocol.cpp */,
+ 9FF504AA1A5EA75D00AFDA55 /* PlayerTaskServiceProtocol.h */,
+ 9FF504AB1A5EA75D00AFDA55 /* PlayerUtils.cpp */,
+ 9FF504AC1A5EA75D00AFDA55 /* PlayerUtils.h */,
9FD6FC0E1A5D281D0028EDC6 /* cocos2dx_extra.h */,
9FD6FC0F1A5D281D0028EDC6 /* network */,
9FD6FC131A5D281D0028EDC6 /* platform */,
9FD6FC161A5D281D0028EDC6 /* ProjectConfig */,
- 9FD6FC1B1A5D281D0028EDC6 /* service */,
);
name = lib;
path = ../lib;
@@ -214,34 +234,6 @@
path = ProjectConfig;
sourceTree = "";
};
- 9FD6FC1B1A5D281D0028EDC6 /* service */ = {
- isa = PBXGroup;
- children = (
- 9FD6FC1C1A5D281D0028EDC6 /* AppEvent.cpp */,
- 9FD6FC1D1A5D281D0028EDC6 /* AppEvent.h */,
- 9FD6FC1E1A5D281D0028EDC6 /* AppLang.cpp */,
- 9FD6FC1F1A5D281D0028EDC6 /* AppLang.h */,
- 9FD6FC201A5D281D0028EDC6 /* DeviceEx.h */,
- 9FD6FC211A5D281D0028EDC6 /* PlayerEditBoxServiceProtocol.h */,
- 9FD6FC221A5D281D0028EDC6 /* PlayerFileDialogServiceProtocol.h */,
- 9FD6FC231A5D281D0028EDC6 /* PlayerMacros.h */,
- 9FD6FC241A5D281D0028EDC6 /* PlayerMenuServiceProtocol.cpp */,
- 9FD6FC251A5D281D0028EDC6 /* PlayerMenuServiceProtocol.h */,
- 9FD6FC261A5D281D0028EDC6 /* PlayerMessageBoxServiceProtocol.h */,
- 9FD6FC271A5D281D0028EDC6 /* PlayerProtocol.cpp */,
- 9FD6FC281A5D281D0028EDC6 /* PlayerProtocol.h */,
- 9FD6FC291A5D281D0028EDC6 /* PlayerServiceProtocol.cpp */,
- 9FD6FC2A1A5D281D0028EDC6 /* PlayerServiceProtocol.h */,
- 9FD6FC2B1A5D281D0028EDC6 /* PlayerSettings.cpp */,
- 9FD6FC2C1A5D281D0028EDC6 /* PlayerSettings.h */,
- 9FD6FC2D1A5D281D0028EDC6 /* PlayerTaskServiceProtocol.cpp */,
- 9FD6FC2E1A5D281D0028EDC6 /* PlayerTaskServiceProtocol.h */,
- 9FD6FC2F1A5D281D0028EDC6 /* PlayerUtils.cpp */,
- 9FD6FC301A5D281D0028EDC6 /* PlayerUtils.h */,
- );
- path = service;
- sourceTree = "";
- };
9FD6FC511A5D2A380028EDC6 /* openudid */ = {
isa = PBXGroup;
children = (
@@ -260,29 +252,29 @@
files = (
9FD6FC331A5D281D0028EDC6 /* CCHTTPRequest.h in Headers */,
9FD6FC631A5D2A380028EDC6 /* PlayerEditBoxServiceMac.h in Headers */,
- 9FD6FC3A1A5D281D0028EDC6 /* AppEvent.h in Headers */,
9FD6FC341A5D281D0028EDC6 /* CCHTTPRequestDelegate.h in Headers */,
- 9FD6FC4D1A5D281D0028EDC6 /* PlayerUtils.h in Headers */,
- 9FD6FC3F1A5D281D0028EDC6 /* PlayerFileDialogServiceProtocol.h in Headers */,
+ 9FF504B21A5EA75D00AFDA55 /* PlayerEditBoxServiceProtocol.h in Headers */,
9FD6FC691A5D2A380028EDC6 /* PlayerMenuServiceMac.h in Headers */,
- 9FD6FC491A5D281D0028EDC6 /* PlayerSettings.h in Headers */,
+ 9FF504C11A5EA75D00AFDA55 /* PlayerUtils.h in Headers */,
+ 9FF504BB1A5EA75D00AFDA55 /* PlayerServiceProtocol.h in Headers */,
+ 9FF504B01A5EA75D00AFDA55 /* AppLang.h in Headers */,
+ 9FF504B31A5EA75D00AFDA55 /* PlayerFileDialogServiceProtocol.h in Headers */,
+ 9FF504B71A5EA75D00AFDA55 /* PlayerMessageBoxServiceProtocol.h in Headers */,
9FD6FC6D1A5D2A380028EDC6 /* PlayerTaskServiceMac.h in Headers */,
+ 9FF504BD1A5EA75D00AFDA55 /* PlayerSettings.h in Headers */,
+ 9FF504B61A5EA75D00AFDA55 /* PlayerMenuServiceProtocol.h in Headers */,
9FD6FC361A5D281D0028EDC6 /* ProjectConfig.h in Headers */,
- 9FD6FC3C1A5D281D0028EDC6 /* AppLang.h in Headers */,
- 9FD6FC421A5D281D0028EDC6 /* PlayerMenuServiceProtocol.h in Headers */,
9FD6FC651A5D2A380028EDC6 /* PlayerFileDialogServiceMac.h in Headers */,
+ 9FF504AE1A5EA75D00AFDA55 /* AppEvent.h in Headers */,
9FD6FC611A5D2A380028EDC6 /* OpenUDIDMac.h in Headers */,
- 9FD6FC3D1A5D281D0028EDC6 /* DeviceEx.h in Headers */,
- 9FD6FC3E1A5D281D0028EDC6 /* PlayerEditBoxServiceProtocol.h in Headers */,
9FD6FC6B1A5D2A380028EDC6 /* PlayerMessageBoxServiceMac.h in Headers */,
- 9FD6FC471A5D281D0028EDC6 /* PlayerServiceProtocol.h in Headers */,
+ 9FF504B11A5EA75D00AFDA55 /* DeviceEx.h in Headers */,
9FD6FC671A5D2A380028EDC6 /* PlayerMac.h in Headers */,
9FD6FC311A5D281D0028EDC6 /* cocos2dx_extra.h in Headers */,
+ 9FF504BF1A5EA75D00AFDA55 /* PlayerTaskServiceProtocol.h in Headers */,
+ 9FF504B41A5EA75D00AFDA55 /* PlayerMacros.h in Headers */,
9FD6FC381A5D281D0028EDC6 /* SimulatorConfig.h in Headers */,
- 9FD6FC431A5D281D0028EDC6 /* PlayerMessageBoxServiceProtocol.h in Headers */,
- 9FD6FC401A5D281D0028EDC6 /* PlayerMacros.h in Headers */,
- 9FD6FC4B1A5D281D0028EDC6 /* PlayerTaskServiceProtocol.h in Headers */,
- 9FD6FC451A5D281D0028EDC6 /* PlayerProtocol.h in Headers */,
+ 9FF504B91A5EA75D00AFDA55 /* PlayerProtocol.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -363,25 +355,25 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 9FD6FC3B1A5D281D0028EDC6 /* AppLang.cpp in Sources */,
- 9FD6FC411A5D281D0028EDC6 /* PlayerMenuServiceProtocol.cpp in Sources */,
9FD6FC6C1A5D2A380028EDC6 /* PlayerMessageBoxServiceMac.mm in Sources */,
+ 9FF504C01A5EA75D00AFDA55 /* PlayerUtils.cpp in Sources */,
+ 9FF504BE1A5EA75D00AFDA55 /* PlayerTaskServiceProtocol.cpp in Sources */,
+ 9FF504BC1A5EA75D00AFDA55 /* PlayerSettings.cpp in Sources */,
+ 9FF504AF1A5EA75D00AFDA55 /* AppLang.cpp in Sources */,
9FD6FC681A5D2A380028EDC6 /* PlayerMac.mm in Sources */,
9FD6FC6A1A5D2A380028EDC6 /* PlayerMenuServiceMac.mm in Sources */,
9FD6FC641A5D2A380028EDC6 /* PlayerEditBoxServiceMac.mm in Sources */,
+ 9FF504B51A5EA75D00AFDA55 /* PlayerMenuServiceProtocol.cpp in Sources */,
+ 9FF504AD1A5EA75D00AFDA55 /* AppEvent.cpp in Sources */,
9FD6FC601A5D2A380028EDC6 /* DeviceEx-mac.mm in Sources */,
- 9FD6FC481A5D281D0028EDC6 /* PlayerSettings.cpp in Sources */,
- 9FD6FC4C1A5D281D0028EDC6 /* PlayerUtils.cpp in Sources */,
- 9FD6FC461A5D281D0028EDC6 /* PlayerServiceProtocol.cpp in Sources */,
9FD6FC661A5D2A380028EDC6 /* PlayerFileDialogServiceMac.mm in Sources */,
- 9FD6FC391A5D281D0028EDC6 /* AppEvent.cpp in Sources */,
9FD6FC371A5D281D0028EDC6 /* SimulatorConfig.cpp in Sources */,
- 9FD6FC441A5D281D0028EDC6 /* PlayerProtocol.cpp in Sources */,
+ 9FF504BA1A5EA75D00AFDA55 /* PlayerServiceProtocol.cpp in Sources */,
9FD6FC6E1A5D2A380028EDC6 /* PlayerTaskServiceMac.mm in Sources */,
9FD6FC321A5D281D0028EDC6 /* CCHTTPRequest.cpp in Sources */,
9FD6FC351A5D281D0028EDC6 /* ProjectConfig.cpp in Sources */,
9FD6FC621A5D2A380028EDC6 /* OpenUDIDMac.m in Sources */,
- 9FD6FC4A1A5D281D0028EDC6 /* PlayerTaskServiceProtocol.cpp in Sources */,
+ 9FF504B81A5EA75D00AFDA55 /* PlayerProtocol.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/tools/simulator/libsimulator/proj.win32/libsimulator.vcxproj b/tools/simulator/libsimulator/proj.win32/libsimulator.vcxproj
index ec670c8ebe..1d89987c16 100644
--- a/tools/simulator/libsimulator/proj.win32/libsimulator.vcxproj
+++ b/tools/simulator/libsimulator/proj.win32/libsimulator.vcxproj
@@ -53,7 +53,7 @@
WIN32;_WINDOWS;STRICT;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS_DEBUG;COCOS2D_DEBUG=1;GLFW_EXPOSE_NATIVE_WIN32;GLFW_EXPOSE_NATIVE_WGL;%(PreprocessorDefinitions)
- $(ProjectDir);$(ProjectDir)..\lib;$(ProjectDir)..\lib\service;$(ProjectDir)..\Classes\protobuf-lite;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)tools\simulator\libsimulator\lib;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)
+ $(ProjectDir);$(ProjectDir)..\lib;$(ProjectDir)..\Classes\protobuf-lite;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)cocos\scripting\lua-bindings\auto;$(EngineRoot)cocos\scripting\lua-bindings\manual;$(EngineRoot)cocos\audio\include;$(EngineRoot)external;$(EngineRoot)external\lua\lua;$(EngineRoot)external\lua\tolua;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\curl\include\win32;$(EngineRoot)tools\simulator\libsimulator\lib;$(EngineRoot)extensions;$(EngineRoot);%(AdditionalIncludeDirectories)
4267;4251;4244;%(DisableSpecificWarnings)
CompileAsCpp
true
@@ -94,19 +94,19 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -121,14 +121,14 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
diff --git a/tools/simulator/libsimulator/proj.win32/libsimulator.vcxproj.filters b/tools/simulator/libsimulator/proj.win32/libsimulator.vcxproj.filters
index 9edf9d0adb..fe0f4e0d8e 100644
--- a/tools/simulator/libsimulator/proj.win32/libsimulator.vcxproj.filters
+++ b/tools/simulator/libsimulator/proj.win32/libsimulator.vcxproj.filters
@@ -34,43 +34,43 @@
ProjectConfig
-
+
service
-
+
service
-
+
service
-
+
service
-
+
service
-
+
service
-
+
service
-
+
service
-
+
service
-
+
service
-
+
service
-
+
service
-
+
service
@@ -105,28 +105,28 @@
ProjectConfig
-
+
service
-
+
service
-
+
service
-
+
service
-
+
service
-
+
service
-
+
service
-
+
service