Buildfix for Linux/Mac at least.

Qt still not happy, I think.
This commit is contained in:
Unknown W. Brackets 2013-03-29 22:21:30 -07:00
parent 9740d71a1f
commit 503b837628
3 changed files with 11 additions and 14 deletions

View File

@ -971,17 +971,6 @@ if(WIN32)
setup_target_project(PPSSPPWindows Windows)
endif()
if(HEADLESS)
add_executable(PPSSPPHeadless
headless/Headless.cpp
headless/StubHost.h
headless/Compare.cpp
headless/Compare.h)
target_link_libraries(PPSSPPHeadless ${CoreLibName}
${COCOA_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
setup_target_project(PPSSPPHeadless headless)
endif()
set(NativeAppSource
android/jni/NativeApp.cpp
android/jni/EmuScreen.cpp
@ -998,6 +987,16 @@ set(NativeAssets
assets/ppge_atlas.zim)
set(LinkCommon ${CoreLibName} ${CMAKE_THREAD_LIBS_INIT} ${nativeExtraLibs})
if(HEADLESS)
add_executable(PPSSPPHeadless ${NativeAppSource}
headless/Headless.cpp
headless/StubHost.h
headless/Compare.cpp
headless/Compare.h)
target_link_libraries(PPSSPPHeadless ${LinkCommon})
setup_target_project(PPSSPPHeadless headless)
endif()
if (TargetBin)
if (IOS)
add_executable(${TargetBin} MACOSX_BUNDLE ${NativeAppSource})

View File

@ -53,8 +53,6 @@ public:
struct InputState;
// Temporary hack around annoying linking error.
void GL_SwapBuffers() { }
void NativeUpdate(InputState &input_state) { }
void NativeRender() { }
void printUsage(const char *progname, const char *reason)
{

2
native

@ -1 +1 @@
Subproject commit 4ffc4f0415c2b2efa79c900fa61da78d61411797
Subproject commit abc38a90f6ec067090dbbc68ecd7f489732d54c0