Skip to content

Commit

Permalink
Fixed a filename bug in Windows. Cleaned up some MSVC warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
@drowaudio
drowaudio committed May 15, 2012
1 parent ca21037 commit 3192ad7
Show file tree
Hide file tree
Showing 19 changed files with 401 additions and 87 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ juce_events/
juce_graphics/
juce_gui_basics/
juce_gui_extra/
juce_opengl/
Band Practice Assistant/
6 changes: 6 additions & 0 deletions apps/dRowAudio Demo/Builds/Linux/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ OBJECTS := \
$(OBJDIR)/juce_graphics_f8def838.o \
$(OBJDIR)/juce_gui_basics_13b83b4.o \
$(OBJDIR)/juce_gui_extra_6053123c.o \
$(OBJDIR)/juce_opengl_a277cb00.o \

.PHONY: clean

Expand Down Expand Up @@ -233,4 +234,9 @@ $(OBJDIR)/juce_gui_extra_6053123c.o: ../../../../../../juce_source/juce/modules/
@echo "Compiling juce_gui_extra.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"

$(OBJDIR)/juce_opengl_a277cb00.o: ../../../../../../juce_source/juce/modules/juce_opengl/juce_opengl.cpp
-@mkdir -p $(OBJDIR)
@echo "Compiling juce_opengl.cpp"
@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"

-include $(OBJECTS:%.o=%.d)
4 changes: 2 additions & 2 deletions apps/dRowAudio Demo/Builds/MacOSX/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>0.5.4</string>
<string>0.5.5</string>
<key>CFBundleVersion</key>
<string>0.5.4</string>
<string>0.5.5</string>
<key>NSHumanReadableCopyright</key>
<string></string>
</dict>
Expand Down
154 changes: 114 additions & 40 deletions apps/dRowAudio Demo/Builds/MacOSX/dRowAudio Demo.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

Binary file modified apps/dRowAudio Demo/Builds/VisualStudio2010/dRowAudio Demo.suo
View file
Binary file not shown.
46 changes: 46 additions & 0 deletions apps/dRowAudio Demo/Builds/VisualStudio2010/dRowAudio Demo.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1256,6 +1256,30 @@
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_gui_extra\native\juce_win32_WebBrowserComponent.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLContext.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLFrameBuffer.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLGraphicsContext.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLHelpers.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLImage.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLPixelFormat.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLShaderProgram.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLTexture.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\BinaryData.cpp"/>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\dRowAudio\dRowAudio.cpp"/>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_audio_basics\juce_audio_basics.cpp"/>
Expand All @@ -1269,6 +1293,7 @@
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_graphics\juce_graphics.cpp"/>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_gui_basics\juce_gui_basics.cpp"/>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_gui_extra\juce_gui_extra.cpp"/>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\juce_opengl.cpp"/>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\Source\DemoHeader.h"/>
Expand Down Expand Up @@ -1726,6 +1751,27 @@
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_gui_extra\misc\juce_WebBrowserComponent.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_gui_extra\native\juce_mac_CarbonViewWrapperComponent.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_gui_extra\juce_gui_extra.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_Draggable3DOrientation.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_Matrix3D.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLContext.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLFrameBuffer.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLGraphicsContext.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLHelpers.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLImage.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLPixelFormat.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLRenderer.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLShaderProgram.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLTexture.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_Quaternion.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_Vector3D.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\native\juce_MissingGLDefinitions.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\native\juce_OpenGL_android.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\native\juce_OpenGL_ios.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\native\juce_OpenGL_linux.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\native\juce_OpenGL_osx.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\native\juce_OpenGL_win32.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\native\juce_OpenGLExtensions.h"/>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\juce_opengl.h"/>
<ClInclude Include="..\..\JuceLibraryCode\AppConfig.h"/>
<ClInclude Include="..\..\JuceLibraryCode\BinaryData.h"/>
<ClInclude Include="..\..\JuceLibraryCode\JuceHeader.h"/>
Expand Down
102 changes: 102 additions & 0 deletions apps/dRowAudio Demo/Builds/VisualStudio2010/dRowAudio Demo.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,6 +314,15 @@
<Filter Include="Juce Modules\juce_gui_extra\native">
<UniqueIdentifier>{C413328B-5D81-89EE-F4F3-75752E700DE4}</UniqueIdentifier>
</Filter>
<Filter Include="Juce Modules\juce_opengl">
<UniqueIdentifier>{639E16C5-DA8B-ADBA-6E24-7B596378EAB2}</UniqueIdentifier>
</Filter>
<Filter Include="Juce Modules\juce_opengl\opengl">
<UniqueIdentifier>{2D8D0E19-E676-83EB-38D9-F73500DD6B79}</UniqueIdentifier>
</Filter>
<Filter Include="Juce Modules\juce_opengl\native">
<UniqueIdentifier>{151B49D8-6102-F802-1C07-D59931BC0574}</UniqueIdentifier>
</Filter>
<Filter Include="Juce Library Code">
<UniqueIdentifier>{8B4D1BAA-6DB4-CAEC-A0FA-271F354D5C61}</UniqueIdentifier>
</Filter>
Expand Down Expand Up @@ -1588,6 +1597,33 @@
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_gui_extra\juce_module_info">
<Filter>Juce Modules\juce_gui_extra</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLContext.cpp">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLFrameBuffer.cpp">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLGraphicsContext.cpp">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLHelpers.cpp">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLImage.cpp">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLPixelFormat.cpp">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLShaderProgram.cpp">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLTexture.cpp">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\juce_module_info">
<Filter>Juce Modules\juce_opengl</Filter>
</ClCompile>
<ClCompile Include="..\..\JuceLibraryCode\BinaryData.cpp">
<Filter>Juce Library Code</Filter>
</ClCompile>
Expand Down Expand Up @@ -1627,6 +1663,9 @@
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_gui_extra\juce_gui_extra.cpp">
<Filter>Juce Library Code</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\juce_opengl.cpp">
<Filter>Juce Library Code</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\Source\DemoHeader.h">
Expand Down Expand Up @@ -2994,6 +3033,69 @@
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_gui_extra\juce_gui_extra.h">
<Filter>Juce Modules\juce_gui_extra</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_Draggable3DOrientation.h">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_Matrix3D.h">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLContext.h">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLFrameBuffer.h">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLGraphicsContext.h">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLHelpers.h">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLImage.h">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLPixelFormat.h">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLRenderer.h">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLShaderProgram.h">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_OpenGLTexture.h">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_Quaternion.h">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\opengl\juce_Vector3D.h">
<Filter>Juce Modules\juce_opengl\opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\native\juce_MissingGLDefinitions.h">
<Filter>Juce Modules\juce_opengl\native</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\native\juce_OpenGL_android.h">
<Filter>Juce Modules\juce_opengl\native</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\native\juce_OpenGL_ios.h">
<Filter>Juce Modules\juce_opengl\native</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\native\juce_OpenGL_linux.h">
<Filter>Juce Modules\juce_opengl\native</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\native\juce_OpenGL_osx.h">
<Filter>Juce Modules\juce_opengl\native</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\native\juce_OpenGL_win32.h">
<Filter>Juce Modules\juce_opengl\native</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\native\juce_OpenGLExtensions.h">
<Filter>Juce Modules\juce_opengl\native</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\..\..\juce_source\juce\modules\juce_opengl\juce_opengl.h">
<Filter>Juce Modules\juce_opengl</Filter>
</ClInclude>
<ClInclude Include="..\..\JuceLibraryCode\AppConfig.h">
<Filter>Juce Library Code</Filter>
</ClInclude>
Expand Down
6 changes: 3 additions & 3 deletions apps/dRowAudio Demo/Builds/VisualStudio2010/resources.rc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
#include <windows.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 0,5,4,0
FILEVERSION 0,5,5,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "FileDescription", "dRowAudio Demo\0"
VALUE "FileVersion", "0.5.4\0"
VALUE "FileVersion", "0.5.5\0"
VALUE "ProductName", "dRowAudio Demo\0"
VALUE "ProductVersion", "0.5.4\0"
VALUE "ProductVersion", "0.5.5\0"
END
END

Expand Down
4 changes: 2 additions & 2 deletions apps/dRowAudio Demo/Builds/iOS/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleShortVersionString</key>
<string>0.5.4</string>
<string>0.5.5</string>
<key>CFBundleVersion</key>
<string>0.5.4</string>
<string>0.5.5</string>
<key>NSHumanReadableCopyright</key>
<string></string>
<key>UIStatusBarHidden</key>
Expand Down
Loading

0 comments on commit 3192ad7

Please sign in to comment.