speed-dreams/speed-dreams-code
6
0
Fork 1
Code Issues 8 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Re #195 (Problems with Display configuration menu) : Fixed Ruin'dows port (as usual :-()

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@2835 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: 96362bf1d5257c10fe26515cab86e5b0afaa7165
Former-commit-id: ec84a158e20a6e5def139a1ff77435d59a12775e
This commit is contained in:
pouillot 2010-10-03 16:34:56 +00:00
parent 3b803c048b
commit c7e3362a83
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake/macros.cmake
View file

@ -1058,6 +1058,10 @@ MACRO(SD_INSTALL_FILES)
IF(WIN32)
GET_TARGET_PROPERTY(TXML_LIB txml LOCATION)
GET_TARGET_PROPERTY(TGF_LIB tgf LOCATION)
FIND_PACKAGE(SDL)
GET_FILENAME_COMPONENT(SDL_LIBPATH ${SDL_LIBRARY} PATH)
GET_FILENAME_COMPONENT(SDL_LIBNAME ${SDL_LIBRARY} NAME_WE)
SET(SDL_LIB ${SDL_LIBPATH}/../bin/${CMAKE_SHARED_LIBRARY_PREFIX}${SDL_LIBNAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
INSTALL(CODE
"FILE(READ ${CMAKE_BINARY_DIR}/xmlversion_loc.txt XMLVERSION_EXE)
STRING(REPLACE \"$(OutDir)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" XMLVERSION_EXE \${XMLVERSION_EXE})
@ -1066,7 +1070,7 @@ MACRO(SD_INSTALL_FILES)
STRING(REPLACE \"$(OutDir)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TXML_LIB \${TXML_LIB})
SET(TGF_LIB ${TGF_LIB})
STRING(REPLACE \"$(OutDir)\" \"\${CMAKE_INSTALL_CONFIG_NAME}\" TGF_LIB \${TGF_LIB})
FILE(INSTALL DESTINATION \${XMLVERSION_DIR} TYPE FILE FILES \${TXML_LIB} \${TGF_LIB})
FILE(INSTALL DESTINATION \${XMLVERSION_DIR} TYPE FILE FILES \${TXML_LIB} \${TGF_LIB} \"${SDL_LIB}\")
SET(SD_DATADIR_ABS \"${SD_DATADIR}\")
IF(NOT IS_ABSOLUTE \${SD_DATADIR_ABS})
GET_FILENAME_COMPONENT(SD_DATADIR_ABS \"\${CMAKE_INSTALL_PREFIX}/\${SD_DATADIR_ABS}\" ABSOLUTE)

2
src/libs/portability/portability.h
View file

@ -24,6 +24,7 @@
#include <cstring>
#ifdef WIN32
#include <direct.h>
#include <process.h>
#endif
#ifdef WIN32
@ -89,6 +90,7 @@ static char *strndup(const char *str, int len)
#undef mkdir
#endif
#define mkdir(x) _mkdir(x)
#define execvp _execvp
#endif
#endif

8
src/libs/tgfclient/guiscreen.cpp
View file

@ -682,14 +682,6 @@ saveParams(void)
void
GfScrReinit(void * /* dummy */)
{
int retcode = 0;
static const int CMDSIZE = 1024;
char cmd[CMDSIZE];
char** args;
int i, nArgs;
int argInd;
// Force current edit to loose focus (if one has it) and update associated variable.
GfuiUnSelectCurrent();