resolved some problems

develop
Petr Mrázek 2009-10-23 18:05:42 +00:00
parent f5acba111e
commit a09f45df71
6 changed files with 15 additions and 9 deletions

@ -23,4 +23,7 @@ ELSE(UNIX)
ENDIF(UNIX) ENDIF(UNIX)
ADD_LIBRARY(dfhack SHARED ${PROJECT_SRCS}) ADD_LIBRARY(dfhack SHARED ${PROJECT_SRCS})
SET_TARGET_PROPERTIES( dfhack PROPERTIES DEBUG_POSTFIX "-debug" )
TARGET_LINK_LIBRARIES(dfhack ${PROJECT_LIBS}) TARGET_LINK_LIBRARIES(dfhack ${PROJECT_LIBS})

@ -35,7 +35,7 @@ distribution.
#include <fstream> #include <fstream>
using namespace std; using namespace std;
#include <integers.h> #include "integers.h"
#include <assert.h> #include <assert.h>
#include <string.h> #include <string.h>

@ -43,7 +43,7 @@ distribution.
#include <string> #include <string>
#include <vector> #include <vector>
#include <integers.h> #include "integers.h"
using namespace std; using namespace std;
class DFHackAPI; class DFHackAPI;

@ -41,7 +41,7 @@ distribution.
# endif # endif
#endif #endif
#include <integers.h> #include "integers.h"
#ifdef __cplusplus #ifdef __cplusplus
# include <vector> # include <vector>

@ -4,10 +4,13 @@ This file is a wrapper for stdint.h
Visual Studio doesn't have stdint.h Visual Studio doesn't have stdint.h
stdint.h is part of the C99 standard. It's ancient and simply should be there. FAIL stdint.h is part of the C99 standard. It's ancient and simply should be there. FAIL
*/
#ifndef _MSC_VER You can turn off the include by defining SKIP_DFHACK_STDINT
#include <stdint.h> */
#else #ifndef SKIP_DFHACK_STDINT
#include <stdint_win.h> #ifndef _MSC_VER
#include <stdint.h>
#else
#include "stdint_win.h"
#endif
#endif #endif

@ -45,7 +45,7 @@
//---------------------------------------------------------------------- //----------------------------------------------------------------------
//STL includes //STL includes
#include <string> #include <string>
#include <integers.h> #include "integers.h"
//---------------------------------------------------------------------- //----------------------------------------------------------------------
//typedefs //typedefs
typedef unsigned char *POINTER; typedef unsigned char *POINTER;