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

Unified Diff: nacltoons/src/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.win/nacltoons/nacltoons.vcxproj ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nacltoons/src/main.cc
diff --git a/nacltoons/src/main.cc b/nacltoons/src/main.cc
deleted file mode 100644
index 2a119e2680626c302cb94854ec51b80d6ffdb48f..0000000000000000000000000000000000000000
--- a/nacltoons/src/main.cc
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
-// 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"
-#include "CCModule.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <string>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <AL/alc.h>
-
-#include "app_delegate.h"
-
-USING_NS_CC;
-AppDelegate g_app;
-
-void* cocos_main(void* arg) {
- CocosPepperInstance* instance = (CocosPepperInstance*)arg;
- fprintf(stderr, "in cocos_main\n");
-
- // Any application that uses OpenAL on NaCl needs to call this
- // before starting OpenAL.
- alSetPpapiInfo(instance->pp_instance(),
- pp::Module::Get()->get_browser_interface());
-
- CCEGLView::g_instance = instance;
- CCEGLView* eglView = CCEGLView::sharedOpenGLView();
- fprintf(stderr, "calling setFrameSize\n");
- eglView->setFrameSize(instance->Size().width(), instance->Size().height());
- fprintf(stderr, "calling application->run\n");
- int rtn = CCApplication::sharedApplication()->run();
- fprintf(stderr, "app run returned: %d\n", rtn);
- return NULL;
-}
-
-namespace pp {
- Module* CreateModule() {
- 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.win/nacltoons/nacltoons.vcxproj ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698