Browse Source

Introjucer: updated some Xcode architecture flags that seem to have changed. Added a VC2013 build.

tags/2021-05-28
jules 12 years ago
parent
commit
ab6314f9e3
8 changed files with 4273 additions and 5 deletions
  1. +2
    -2
      extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj
  2. +19
    -0
      extras/Introjucer/Builds/VisualStudio2013/The Introjucer.sln
  3. +1500
    -0
      extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj
  4. +2699
    -0
      extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj.filters
  5. BIN
      extras/Introjucer/Builds/VisualStudio2013/icon.ico
  6. +33
    -0
      extras/Introjucer/Builds/VisualStudio2013/resources.rc
  7. +19
    -2
      extras/Introjucer/Introjucer.jucer
  8. +1
    -1
      extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h

+ 2
- 2
extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj View File

@@ -1876,6 +1876,7 @@
0FFEF043CA89142B18C79ABE,
92ABB8016546F41128399E9D ); name = Source; sourceTree = "<group>"; };
EA0BCC969703B2D179089E55 = { isa = XCBuildConfiguration; buildSettings = {
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
HEADER_SEARCH_PATHS = "../../JuceLibraryCode ../../../../modules $(inherited)";
GCC_OPTIMIZATION_LEVEL = 0;
INFOPLIST_FILE = Info.plist;
@@ -1888,7 +1889,6 @@
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_LINK_OBJC_RUNTIME = NO;
COMBINE_HIDPI_IMAGES = YES;
ONLY_ACTIVE_ARCH = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -1896,7 +1896,7 @@
"DEBUG=1",
"JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; };
B159CF4275B8A90122629FF4 = { isa = XCBuildConfiguration; buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
ARCHS = "$(NATIVE_ARCH_ACTUAL)";
HEADER_SEARCH_PATHS = "../../JuceLibraryCode ../../../../modules $(inherited)";
GCC_OPTIMIZATION_LEVEL = 3;
INFOPLIST_FILE = Info.plist;


+ 19
- 0
extras/Introjucer/Builds/VisualStudio2013/The Introjucer.sln View File

@@ -0,0 +1,19 @@
Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2013
Project("{62DDBD62-D03F-FBCA-D85C-731B2D53653D}") = "The Introjucer", "The Introjucer.vcxproj", "{26ABE2A4-1F2F-8375-088D-D692A4408B5A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Release|Win32 = Release|Win32
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{26ABE2A4-1F2F-8375-088D-D692A4408B5A}.Debug|Win32.ActiveCfg = Debug|Win32
{26ABE2A4-1F2F-8375-088D-D692A4408B5A}.Debug|Win32.Build.0 = Debug|Win32
{26ABE2A4-1F2F-8375-088D-D692A4408B5A}.Release|Win32.ActiveCfg = Release|Win32
{26ABE2A4-1F2F-8375-088D-D692A4408B5A}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

+ 1500
- 0
extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj
File diff suppressed because it is too large
View File


+ 2699
- 0
extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj.filters
File diff suppressed because it is too large
View File


BIN
extras/Introjucer/Builds/VisualStudio2013/icon.ico View File

Before After

+ 33
- 0
extras/Introjucer/Builds/VisualStudio2013/resources.rc View File

@@ -0,0 +1,33 @@
#ifdef JUCE_USER_DEFINED_RC_FILE
#include JUCE_USER_DEFINED_RC_FILE
#else
#undef WIN32_LEAN_AND_MEAN
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,1,0,0
BEGIN
BLOCK "StringFileInfo"
BEGIN
BLOCK "040904E4"
BEGIN
VALUE "CompanyName", "Raw Material Software Ltd.\0"
VALUE "FileDescription", "The Introjucer\0"
VALUE "FileVersion", "3.1.0\0"
VALUE "ProductName", "The Introjucer\0"
VALUE "ProductVersion", "3.1.0\0"
END
END
BLOCK "VarFileInfo"
BEGIN
VALUE "Translation", 0x409, 65001
END
END
#endif
IDI_ICON1 ICON DISCARDABLE "icon.ico"
IDI_ICON2 ICON DISCARDABLE "icon.ico"

+ 19
- 2
extras/Introjucer/Introjucer.jucer View File

@@ -18,9 +18,9 @@
extraCompilerFlags="-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing -Wuninitialized -Wunused-parameter">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="Introjucer"
osxSDK="default" osxCompatibility="default" osxArchitecture="default"/>
osxSDK="default" osxCompatibility="default" osxArchitecture="Native"/>
<CONFIGURATION name="Release" isDebug="0" optimisation="3" targetName="Introjucer"
osxSDK="default" osxCompatibility="10.5 SDK" osxArchitecture="32BitUniversal"/>
osxSDK="default" osxCompatibility="10.5 SDK" osxArchitecture="Native"/>
</CONFIGURATIONS>
<MODULEPATHS>
<MODULEPATH id="juce_gui_extra" path="../../modules"/>
@@ -121,6 +121,23 @@
<MODULEPATH id="juce_core" path="../../modules"/>
</MODULEPATHS>
</VS2012>
<VS2013 targetFolder="Builds/VisualStudio2013" bigIcon="rVgowdy">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" winWarningLevel="4" generateManifest="1" winArchitecture="32-bit"
isDebug="1" optimisation="1" targetName="The Introjucer"/>
<CONFIGURATION name="Release" winWarningLevel="4" generateManifest="1" winArchitecture="32-bit"
isDebug="0" optimisation="2" targetName="The Introjucer"/>
</CONFIGURATIONS>
<MODULEPATHS>
<MODULEPATH id="juce_gui_extra" path="../../modules"/>
<MODULEPATH id="juce_gui_basics" path="../../modules"/>
<MODULEPATH id="juce_graphics" path="../../modules"/>
<MODULEPATH id="juce_events" path="../../modules"/>
<MODULEPATH id="juce_data_structures" path="../../modules"/>
<MODULEPATH id="juce_cryptography" path="../../modules"/>
<MODULEPATH id="juce_core" path="../../modules"/>
</MODULEPATHS>
</VS2013>
<CODEBLOCKS targetFolder="Builds/CodeBlocks">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" isDebug="1" optimisation="1" targetName="The Introjucer"/>


+ 1
- 1
extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h View File

@@ -659,7 +659,7 @@ private:
StringArray s;
const String arch (config.getMacArchitecture());
if (arch == osxArch_Native) s.add ("ARCHS = \"$(ARCHS_NATIVE)\"");
if (arch == osxArch_Native) s.add ("ARCHS = \"$(NATIVE_ARCH_ACTUAL)\"");
else if (arch == osxArch_32BitUniversal) s.add ("ARCHS = \"$(ARCHS_STANDARD_32_BIT)\"");
else if (arch == osxArch_64BitUniversal) s.add ("ARCHS = \"$(ARCHS_STANDARD_32_64_BIT)\"");
else if (arch == osxArch_64Bit) s.add ("ARCHS = \"$(ARCHS_STANDARD_64_BIT)\"");


Loading…
Cancel
Save