Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6)

Unified Diff: nacltoons/proj.nacl/main.cc

Issue 14851014: [nacltoons] Move nacl-specific build to proj.nacl (Closed) Base URL: https://nativeclient-sdk.googlecode.com/svn/trunk/src
Patch Set: Created 7 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « nacltoons/proj.nacl/Makefile ('k') | nacltoons/proj.win/main.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nacltoons/proj.nacl/main.cc
diff --git a/nacltoons/src/main.cc b/nacltoons/proj.nacl/main.cc
similarity index 54%
rename from nacltoons/src/main.cc
rename to nacltoons/proj.nacl/main.cc
index 2a119e2680626c302cb94854ec51b80d6ffdb48f..f3d60d24ab28647ea950e6f7a2babd50743896cf 100644
--- a/nacltoons/src/main.cc
+++ b/nacltoons/proj.nacl/main.cc
@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef WIN32
-
#include "CCStdC.h"
#include "cocos2d.h"
#include "CCInstance.h"
@@ -46,40 +44,3 @@ namespace pp {
return new CocosPepperModule();
}
}
-
-#else
-
-#define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
-// Windows Header Files:
-#include <windows.h>
-#include <tchar.h>
-
-// C RunTime Header Files
-#include "CCStdC.h"
-
-
-#include "app_delegate.h"
-#include "CCEGLView.h"
-
-USING_NS_CC;
-AppDelegate g_app;
-
-int APIENTRY _tWinMain(HINSTANCE hInstance,
- HINSTANCE hPrevInstance,
- LPTSTR lpCmdLine,
- int nCmdShow)
-{
- UNREFERENCED_PARAMETER(hPrevInstance);
- UNREFERENCED_PARAMETER(lpCmdLine);
-
- // create the application instance
- CCEGLView* eglView = CCEGLView::sharedOpenGLView();
- eglView->setViewName("HelloCpp");
- eglView->setFrameSize(2048, 1536);
- // The resolution of ipad3 is very large. In general, PC's resolution is smaller than it.
- // So we need to invoke 'setFrameZoomFactor'(only valid on desktop(win32, mac, linux)) to make the window smaller.
- eglView->setFrameZoomFactor(0.4f);
- return CCApplication::sharedApplication()->run();
-}
-
-#endif
« no previous file with comments | « nacltoons/proj.nacl/Makefile ('k') | nacltoons/proj.win/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698