Browse Source

Fix Windows and Linux builds

Josh Engebretson 10 years ago
parent
commit
9a70024fd5
3 changed files with 7 additions and 2 deletions
  1. 1 1
      Rakefile
  2. 5 0
      Source/Atomic/Audio/SoundSource.cpp
  3. 1 1
      Source/Atomic/Audio/SoundSource.h

+ 1 - 1
Rakefile

@@ -62,7 +62,7 @@ namespace :build  do
       sh "cmake ../../ -G \"Visual Studio 14 2015\""
       sh "cmake ../../ -G \"Visual Studio 14 2015\""
 
 
       # specify 32 bit
       # specify 32 bit
-      sh "msbuild /m Atomic.sln /property:Configuration=Release /p:PlatformTarget=x86"
+      sh "msbuild /m Atomic.sln /p:Configuration=Release /p:Platform=x86"
 
 
     end
     end
 
 

+ 5 - 0
Source/Atomic/Audio/SoundSource.cpp

@@ -1245,4 +1245,9 @@ void SoundSource::MixNull(float timeStep)
     }
     }
 }
 }
 
 
+void SoundSource::SetSound(Sound* sound)
+{
+    if (sound) SetSoundAttr(GetResourceRef(sound, ""));
+}
+
 }
 }

+ 1 - 1
Source/Atomic/Audio/SoundSource.h

@@ -78,7 +78,7 @@ public:
     // BEGIN ATOMIC
     // BEGIN ATOMIC
 
 
     /// Return sound.
     /// Return sound.
-    void SetSound(Sound* sound) { if (sound) SetSoundAttr(GetResourceRef(sound, "")); }
+    void SetSound(Sound* sound);
 
 
     // END ATOMIC
     // END ATOMIC