Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
SRB2
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
STJr
SRB2
Commits
882355d2
Commit
882355d2
authored
6 years ago
by
Marco Z
Browse files
Options
Downloads
Patches
Plain Diff
Specify HAVE_LIBGME, paths, and depends only for Win32/x64 MSVC
parent
09ed8bd0
No related branches found
No related tags found
1 merge request
!448
Add GME to MSVC 10 solution
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
libs/libgme.props
+2
-2
2 additions, 2 deletions
libs/libgme.props
src/sdl/Srb2SDL.props
+4
-1
4 additions, 1 deletion
src/sdl/Srb2SDL.props
src/win32/Srb2win.props
+4
-1
4 additions, 1 deletion
src/win32/Srb2win.props
with
10 additions
and
4 deletions
libs/libgme.props
+
2
−
2
View file @
882355d2
...
...
@@ -2,12 +2,12 @@
<Project
ToolsVersion=
"4.0"
xmlns=
"http://schemas.microsoft.com/developer/msbuild/2003"
>
<ImportGroup
Label=
"PropertySheets"
/>
<PropertyGroup
Label=
"UserMacros"
/>
<PropertyGroup>
<PropertyGroup
Condition=
"'$(Platform)' == 'Win32' OR '$(Platform)' == 'x64'"
>
<IncludePath>
$(SolutionDir)libs\gme\include;$(IncludePath)
</IncludePath>
<LibraryPath
Condition=
"'$(Platform)' == 'Win32'"
>
$(SolutionDir)libs\gme\win32;$(LibraryPath)
</LibraryPath>
<LibraryPath
Condition=
"'$(Platform)' == 'x64'"
>
$(SolutionDir)libs\gme\win64;$(LibraryPath)
</LibraryPath>
</PropertyGroup>
<ItemDefinitionGroup>
<ItemDefinitionGroup
Condition=
"'$(Platform)' == 'Win32' OR '$(Platform)' == 'x64'"
>
<Link>
<AdditionalDependencies>
libgme.dll.a;%(AdditionalDependencies)
</AdditionalDependencies>
</Link>
...
...
This diff is collapsed.
Click to expand it.
src/sdl/Srb2SDL.props
+
4
−
1
View file @
882355d2
...
...
@@ -5,7 +5,10 @@
<PropertyGroup
/>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>
USE_WGL_SWAP;DIRECTFULLSCREEN;HAVE_SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;HAVE_LIBGME;HAVE_ZLIB;SDLMAIN;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<!-- x86/x64 defines: has specific libraries that ARM does not -->
<PreprocessorDefinitions
Condition=
"'$(Platform)' == 'Win32' OR '$(Platform)' == 'x64'"
>
HAVE_ZLIB;HAVE_LIBGME;USE_WGL_SWAP;DIRECTFULLSCREEN;HAVE_SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;SDLMAIN;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<!-- ARM defines -->
<PreprocessorDefinitions
Condition=
"'$(Platform)' != 'Win32' AND '$(Platform)' != 'x64'"
>
USE_WGL_SWAP;DIRECTFULLSCREEN;HAVE_SDL;HWRENDER;HW3SOUND;HAVE_FILTER;HAVE_MIXER;SDLMAIN;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup
/>
...
...
This diff is collapsed.
Click to expand it.
src/win32/Srb2win.props
+
4
−
1
View file @
882355d2
...
...
@@ -5,7 +5,10 @@
<PropertyGroup
/>
<ItemDefinitionGroup>
<ClCompile>
<PreprocessorDefinitions>
_WINDOWS;HAVE_LIBGME;HAVE_ZLIB;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<!-- x86/x64 defines: has specific libraries that ARM does not -->
<PreprocessorDefinitions
Condition=
"'$(Platform)' == 'Win32' OR '$(Platform)' == 'x64'"
>
HAVE_ZLIB;HAVE_LIBGME;_WINDOWS;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
<!-- ARM defines -->
<PreprocessorDefinitions
Condition=
"'$(Platform)' != 'Win32' AND '$(Platform)' != 'x64'"
>
_WINDOWS;%(PreprocessorDefinitions)
</PreprocessorDefinitions>
</ClCompile>
<Link
/>
<Link>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment