diff --git a/project/msvc/README.txt b/project/msvc/README.txt index bc7b7da9..9d21ff3b 100644 --- a/project/msvc/README.txt +++ b/project/msvc/README.txt @@ -5,6 +5,7 @@ in directories : ..\..\..\..\SDL-1.2.15 ..\..\..\..\SDL_image-1.2.12 ..\..\..\..\lua +Edit the file libraries.props to set the correct paths for your configuration. That is, if grafX2 sources are in C:\stuff\code\grafX2 Visual studio project files are in C:\stuff\code\grafX2\project\msvc diff --git a/project/msvc/grafx2-win32.vcxproj b/project/msvc/grafx2-win32.vcxproj index f990c4dc..25cdf9b5 100644 --- a/project/msvc/grafx2-win32.vcxproj +++ b/project/msvc/grafx2-win32.vcxproj @@ -14,6 +14,7 @@ {34A001FF-927D-4E09-BE4A-F5D1C4AF39C6} grafx2win32 + Application @@ -52,10 +53,12 @@ Disabled NOTTF;__ENABLE_LUA__;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;WIN32;_DEBUG;%(PreprocessorDefinitions) 4244 - ..\..\..\..\lpng1634;..\..\..\..\lua\include;%(AdditionalIncludeDirectories) + $(PNGIncDir);$(LuaIncDir);%(AdditionalIncludeDirectories) true + lua53.lib;libpng16.lib;%(AdditionalDependencies) + $(PNGLibDir);$(LuaLibDir);%(AdditionalLibraryDirectories) @@ -66,12 +69,14 @@ true NOTTF;__ENABLE_LUA__;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;WIN32;NDEBUG;%(PreprocessorDefinitions) 4244 - ..\..\..\..\lpng1634;..\..\..\..\lua\include;%(AdditionalIncludeDirectories) + $(PNGIncDir);$(LuaIncDir);%(AdditionalIncludeDirectories) true true true + lua53.lib;libpng16.lib;%(AdditionalDependencies) + $(PNGLibDir);$(LuaLibDir);%(AdditionalLibraryDirectories) diff --git a/project/msvc/grafx2.vcxproj b/project/msvc/grafx2.vcxproj index 0162b51a..4a4ced7c 100644 --- a/project/msvc/grafx2.vcxproj +++ b/project/msvc/grafx2.vcxproj @@ -15,6 +15,7 @@ Win32Proj grafx2 + Application @@ -55,14 +56,14 @@ Level3 Disabled USE_SDL;NOTTF;__ENABLE_LUA__;__no_pnglib__;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - ..\..\..\..\SDL_image-1.2.12\include;..\..\..\..\SDL-1.2.15\include;..\..\..\..\lua\include;%(AdditionalIncludeDirectories) + $(SDLImageIncDir);$(SDLIncDir);$(LuaIncDir);%(AdditionalIncludeDirectories) 4244;%(DisableSpecificWarnings) Windows true SDL.lib;SDLmain.lib;SDL_image.lib;lua53.lib;%(AdditionalDependencies) - ..\..\..\..\SDL-1.2.15\lib\x86;..\..\..\..\SDL_image-1.2.12\lib\x86;..\..\..\..\lua;%(AdditionalLibraryDirectories) + $(SDLLibDir);$(SDLImageLibDir);$(LuaLibDir);%(AdditionalLibraryDirectories) @@ -74,7 +75,7 @@ true true USE_SDL;NOTTF;__ENABLE_LUA__;__no_pnglib__;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - ..\..\..\..\SDL_image-1.2.12\include;..\..\..\..\SDL-1.2.15\include;..\..\..\..\lua\include;%(AdditionalIncludeDirectories) + $(SDLImageIncDir);$(SDLIncDir);$(LuaIncDir);;%(AdditionalIncludeDirectories) 4244;%(DisableSpecificWarnings) @@ -83,7 +84,7 @@ true true SDL.lib;SDLmain.lib;SDL_image.lib;lua53.lib;%(AdditionalDependencies) - ..\..\..\..\SDL-1.2.15\lib\x86;..\..\..\..\SDL_image-1.2.12\lib\x86;..\..\..\..\lua;%(AdditionalLibraryDirectories) + $(SDLLibDir);$(SDLImageLibDir);$(LuaLibDir);%(AdditionalLibraryDirectories) diff --git a/project/msvc/libraries.props b/project/msvc/libraries.props new file mode 100644 index 00000000..92d287dc --- /dev/null +++ b/project/msvc/libraries.props @@ -0,0 +1,14 @@ + + + + ..\..\..\..\SDL-1.2.15\include + ..\..\..\..\SDL-1.2.15\lib\x86 + ..\..\..\..\SDL_image-1.2.12\include + ..\..\..\..\SDL_image-1.2.12\lib\x86 + ..\..\..\..\lua\include + ..\..\..\..\lua + ..\..\..\..\lpng1634 + ..\..\..\..\lpng1634\projects\vstudio\Debug + +