Skip to content

Commit

Permalink
cleanup proj.android
Browse files Browse the repository at this point in the history
  • Loading branch information
SunLightJuly committed Mar 10, 2015
1 parent b77801a commit 6c2eb01
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 52 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include <jni.h>
#include <android/log.h>
#include "ide-support/SimpleConfigParser.h"
#include "ide-support/CodeIDESupport.h"

#define LOG_TAG "main"
#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
Expand All @@ -25,7 +24,7 @@ extern "C"

bool Java_org_cocos2dx_lua_AppActivity_nativeIsDebug(JNIEnv *env, jobject thisz)
{
#if (COCOS2D_DEBUG > 0) && (CC_CODE_IDE_DEBUG_SUPPORT > 0)
#if (COCOS2D_DEBUG > 0)
return true;
#else
return false;
Expand Down
30 changes: 1 addition & 29 deletions tools/simulator/libsimulator/proj.android/Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,43 +6,15 @@ LOCAL_MODULE := cocos2d_simulator_static
LOCAL_MODULE_FILENAME := libsimulator

LOCAL_SRC_FILES := \
../lib/protobuf-lite/google/protobuf/io/coded_stream.cc \
../lib/protobuf-lite/google/protobuf/stubs/common.cc \
../lib/protobuf-lite/google/protobuf/extension_set.cc \
../lib/protobuf-lite/google/protobuf/generated_message_util.cc \
../lib/protobuf-lite/google/protobuf/message_lite.cc \
../lib/protobuf-lite/google/protobuf/stubs/once.cc \
../lib/protobuf-lite/google/protobuf/stubs/atomicops_internals_x86_gcc.cc \
../lib/protobuf-lite/google/protobuf/repeated_field.cc \
../lib/protobuf-lite/google/protobuf/wire_format_lite.cc \
../lib/protobuf-lite/google/protobuf/io/zero_copy_stream.cc \
../lib/protobuf-lite/google/protobuf/io/zero_copy_stream_impl_lite.cc \
../lib/protobuf-lite/google/protobuf/stubs/stringprintf.cc \
../lib/runtime/ConnectWaitLayer.cpp \
../lib/runtime/ConsoleCommand.cpp \
../lib/runtime/FileServer.cpp \
../lib/runtime/Landscape_png.cpp \
../lib/runtime/lua_debugger.c \
../lib/runtime/PlayDisable_png.cpp \
../lib/runtime/PlayEnable_png.cpp \
../lib/runtime/Portrait_png.cpp \
../lib/runtime/Protos.pb.cc \
../lib/runtime/Runtime.cpp \
../lib/runtime/RuntimeProtocol.cpp \
../lib/runtime/RuntimeLuaImpl.cpp \
../lib/runtime/RuntimeCCSImpl.cpp \
../lib/runtime/Shine_png.cpp \
../lib/runtime/ConfigParser.cpp \
../lib/runtime/VisibleRect.cpp \
../lib/ProjectConfig/ProjectConfig.cpp \
../lib/ProjectConfig/SimulatorConfig.cpp \
hellolua/Runtime_android.cpp \


LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../lib


LOCAL_C_INCLUDES := $(LOCAL_PATH)/../lib $(LOCAL_PATH)/../lib/protobuf-lite
LOCAL_C_INCLUDES := $(LOCAL_PATH)/../lib

LOCAL_STATIC_LIBRARIES := cocos2d_lua_static

Expand Down

This file was deleted.

0 comments on commit 6c2eb01

Please sign in to comment.