Skip to content

Commit 0949940

Browse files
dimitredimitre
authored
projectGenerator local_addon fixes (#339)
1 parent 2728116 commit 0949940

31 files changed

+390
-854
lines changed

‎commandLine/Project.xcconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ OF_PATH = ../../..
55
//THIS HAS ALL THE HEADER AND LIBS FOR OF CORE
66
#include "../../../libs/openFrameworksCompiled/project/osx/CoreOF.xcconfig"
77

8-
HEADER_OF = "$(OF_PATH)/libs/openFrameworks/{ofMain.h}"
8+
HEADER_OF = "$(OF_PATH)/libs/openFrameworks" "$(OF_PATH)/libs/openFrameworks/utils"
99

1010

1111
OF_CORE_LIBS = $(LIB_GLEW) $(LIB_PUGIXML)

‎commandLine/addons.make

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +0,0 @@
1-
../ofxProjectGenerator

‎commandLine/commandLine.cbp

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -136,113 +136,113 @@
136136
<debugger />
137137
<envvars />
138138
</Extensions>
139-
<Unit filename="../../../addons/ofxProjectGenerator/src/addons/ofAddon.cpp">
140-
<Option virtualFolder="addons/ofxProjectGenerator/src/addons" />
139+
<Unit filename="src/addons/ofAddon.cpp">
140+
<Option virtualFolder="src/addons" />
141141
</Unit>
142-
<Unit filename="../../../addons/ofxProjectGenerator/src/addons/ofAddon.h">
143-
<Option virtualFolder="addons/ofxProjectGenerator/src/addons" />
142+
<Unit filename="src/addons/ofAddon.h">
143+
<Option virtualFolder="src/addons" />
144144
</Unit>
145-
<Unit filename="../../../addons/ofxProjectGenerator/src/projects/baseProject.cpp">
146-
<Option virtualFolder="addons/ofxProjectGenerator/src/projects" />
145+
<Unit filename="src/projects/baseProject.cpp">
146+
<Option virtualFolder="src/projects" />
147147
</Unit>
148-
<Unit filename="../../../addons/ofxProjectGenerator/src/projects/baseProject.h">
149-
<Option virtualFolder="addons/ofxProjectGenerator/src/projects" />
148+
<Unit filename="src/projects/baseProject.h">
149+
<Option virtualFolder="src/projects" />
150150
</Unit>
151-
<Unit filename="../../../addons/ofxProjectGenerator/src/projects/CBLinuxProject.cpp">
152-
<Option virtualFolder="addons/ofxProjectGenerator/src/projects" />
151+
<Unit filename="src/projects/CBLinuxProject.cpp">
152+
<Option virtualFolder="src/projects" />
153153
</Unit>
154-
<Unit filename="../../../addons/ofxProjectGenerator/src/projects/CBLinuxProject.h">
155-
<Option virtualFolder="addons/ofxProjectGenerator/src/projects" />
154+
<Unit filename="src/projects/CBLinuxProject.h">
155+
<Option virtualFolder="src/projects" />
156156
</Unit>
157-
<Unit filename="../../../addons/ofxProjectGenerator/src/projects/CBWinProject.cpp">
158-
<Option virtualFolder="addons/ofxProjectGenerator/src/projects" />
157+
<Unit filename="src/projects/CBWinProject.cpp">
158+
<Option virtualFolder="src/projects" />
159159
</Unit>
160-
<Unit filename="../../../addons/ofxProjectGenerator/src/projects/CBWinProject.h">
161-
<Option virtualFolder="addons/ofxProjectGenerator/src/projects" />
160+
<Unit filename="src/projects/CBWinProject.h">
161+
<Option virtualFolder="src/projects" />
162162
</Unit>
163-
<Unit filename="../../../addons/ofxProjectGenerator/src/projects/visualStudioProject.cpp">
164-
<Option virtualFolder="addons/ofxProjectGenerator/src/projects" />
163+
<Unit filename="src/projects/visualStudioProject.cpp">
164+
<Option virtualFolder="src/projects" />
165165
</Unit>
166-
<Unit filename="../../../addons/ofxProjectGenerator/src/projects/visualStudioProject.h">
167-
<Option virtualFolder="addons/ofxProjectGenerator/src/projects" />
166+
<Unit filename="src/projects/visualStudioProject.h">
167+
<Option virtualFolder="src/projects" />
168168
</Unit>
169-
<Unit filename="../../../addons/ofxProjectGenerator/src/projects/xcodeProject.cpp">
170-
<Option virtualFolder="addons/ofxProjectGenerator/src/projects" />
169+
<Unit filename="src/projects/xcodeProject.cpp">
170+
<Option virtualFolder="src/projects" />
171171
</Unit>
172-
<Unit filename="../../../addons/ofxProjectGenerator/src/projects/xcodeProject.h">
173-
<Option virtualFolder="addons/ofxProjectGenerator/src/projects" />
172+
<Unit filename="src/projects/xcodeProject.h">
173+
<Option virtualFolder="src/projects" />
174174
</Unit>
175-
<Unit filename="../../../addons/ofxProjectGenerator/src/utils/Utils.cpp">
176-
<Option virtualFolder="addons/ofxProjectGenerator/src/utils" />
175+
<Unit filename="src/utils/Utils.cpp">
176+
<Option virtualFolder="src/utils" />
177177
</Unit>
178-
<Unit filename="../../../addons/ofxProjectGenerator/src/utils/Utils.h">
179-
<Option virtualFolder="addons/ofxProjectGenerator/src/utils" />
178+
<Unit filename="src/utils/Utils.h">
179+
<Option virtualFolder="src/utils" />
180180
</Unit>
181-
<Unit filename="../../../addons/ofxProjectGenerator/libs/pugixml/src/pugiconfig.hpp">
182-
<Option virtualFolder="addons/ofxProjectGenerator/libs/pugixml/src" />
181+
<Unit filename="libs/pugixml/src/pugiconfig.hpp">
182+
<Option virtualFolder="libs/pugixml/src" />
183183
</Unit>
184-
<Unit filename="../../../addons/ofxProjectGenerator/libs/pugixml/src/pugixml.cpp">
185-
<Option virtualFolder="addons/ofxProjectGenerator/libs/pugixml/src" />
184+
<Unit filename="libs/pugixml/src/pugixml.cpp">
185+
<Option virtualFolder="libs/pugixml/src" />
186186
</Unit>
187-
<Unit filename="../../../addons/ofxProjectGenerator/libs/pugixml/src/pugixml.hpp">
188-
<Option virtualFolder="addons/ofxProjectGenerator/libs/pugixml/src" />
187+
<Unit filename="libs/pugixml/src/pugixml.hpp">
188+
<Option virtualFolder="libs/pugixml/src" />
189189
</Unit>
190-
<Unit filename="../ofxProjectGenerator/src/utils/LibraryBinary.h">
191-
<Option virtualFolder="local_addons/ofxProjectGenerator/src/utils" />
190+
<Unit filename="src/utils/LibraryBinary.h">
191+
<Option virtualFolder="local_src/utils" />
192192
</Unit>
193-
<Unit filename="../ofxProjectGenerator/src/utils/Utils.h">
194-
<Option virtualFolder="local_addons/ofxProjectGenerator/src/utils" />
193+
<Unit filename="src/utils/Utils.h">
194+
<Option virtualFolder="local_src/utils" />
195195
</Unit>
196-
<Unit filename="../ofxProjectGenerator/src/utils/LibraryBinary.cpp">
197-
<Option virtualFolder="local_addons/ofxProjectGenerator/src/utils" />
196+
<Unit filename="src/utils/LibraryBinary.cpp">
197+
<Option virtualFolder="local_src/utils" />
198198
</Unit>
199-
<Unit filename="../ofxProjectGenerator/src/utils/Utils.cpp">
200-
<Option virtualFolder="local_addons/ofxProjectGenerator/src/utils" />
199+
<Unit filename="src/utils/Utils.cpp">
200+
<Option virtualFolder="local_src/utils" />
201201
</Unit>
202-
<Unit filename="../ofxProjectGenerator/src/projects/CBLinuxProject.h">
203-
<Option virtualFolder="local_addons/ofxProjectGenerator/src/projects" />
202+
<Unit filename="src/projects/CBLinuxProject.h">
203+
<Option virtualFolder="local_src/projects" />
204204
</Unit>
205-
<Unit filename="../ofxProjectGenerator/src/projects/visualStudioProject.h">
206-
<Option virtualFolder="local_addons/ofxProjectGenerator/src/projects" />
205+
<Unit filename="src/projects/visualStudioProject.h">
206+
<Option virtualFolder="local_src/projects" />
207207
</Unit>
208-
<Unit filename="../ofxProjectGenerator/src/projects/baseProject.h">
209-
<Option virtualFolder="local_addons/ofxProjectGenerator/src/projects" />
208+
<Unit filename="src/projects/baseProject.h">
209+
<Option virtualFolder="local_src/projects" />
210210
</Unit>
211-
<Unit filename="../ofxProjectGenerator/src/projects/baseProject.cpp">
212-
<Option virtualFolder="local_addons/ofxProjectGenerator/src/projects" />
211+
<Unit filename="src/projects/baseProject.cpp">
212+
<Option virtualFolder="local_src/projects" />
213213
</Unit>
214-
<Unit filename="../ofxProjectGenerator/src/projects/CBWinProject.h">
215-
<Option virtualFolder="local_addons/ofxProjectGenerator/src/projects" />
214+
<Unit filename="src/projects/CBWinProject.h">
215+
<Option virtualFolder="local_src/projects" />
216216
</Unit>
217-
<Unit filename="../ofxProjectGenerator/src/projects/xcodeProject.cpp">
218-
<Option virtualFolder="local_addons/ofxProjectGenerator/src/projects" />
217+
<Unit filename="src/projects/xcodeProject.cpp">
218+
<Option virtualFolder="local_src/projects" />
219219
</Unit>
220-
<Unit filename="../ofxProjectGenerator/src/projects/CBLinuxProject.cpp">
221-
<Option virtualFolder="local_addons/ofxProjectGenerator/src/projects" />
220+
<Unit filename="src/projects/CBLinuxProject.cpp">
221+
<Option virtualFolder="local_src/projects" />
222222
</Unit>
223-
<Unit filename="../ofxProjectGenerator/src/projects/CBWinProject.cpp">
224-
<Option virtualFolder="local_addons/ofxProjectGenerator/src/projects" />
223+
<Unit filename="src/projects/CBWinProject.cpp">
224+
<Option virtualFolder="local_src/projects" />
225225
</Unit>
226-
<Unit filename="../ofxProjectGenerator/src/projects/visualStudioProject.cpp">
227-
<Option virtualFolder="local_addons/ofxProjectGenerator/src/projects" />
226+
<Unit filename="src/projects/visualStudioProject.cpp">
227+
<Option virtualFolder="local_src/projects" />
228228
</Unit>
229-
<Unit filename="../ofxProjectGenerator/src/projects/xcodeProject.h">
230-
<Option virtualFolder="local_addons/ofxProjectGenerator/src/projects" />
229+
<Unit filename="src/projects/xcodeProject.h">
230+
<Option virtualFolder="local_src/projects" />
231231
</Unit>
232-
<Unit filename="../ofxProjectGenerator/src/addons/ofAddon.h">
233-
<Option virtualFolder="local_addons/ofxProjectGenerator/src/addons" />
232+
<Unit filename="src/addons/ofAddon.h">
233+
<Option virtualFolder="local_src/addons" />
234234
</Unit>
235-
<Unit filename="../ofxProjectGenerator/src/addons/ofAddon.cpp">
236-
<Option virtualFolder="local_addons/ofxProjectGenerator/src/addons" />
235+
<Unit filename="src/addons/ofAddon.cpp">
236+
<Option virtualFolder="local_src/addons" />
237237
</Unit>
238-
<Unit filename="../ofxProjectGenerator/libs/pugixml/src/pugixml.hpp">
239-
<Option virtualFolder="../ofxProjectGenerator/libs/pugixml/src" />
238+
<Unit filename="libs/pugixml/src/pugixml.hpp">
239+
<Option virtualFolder="libs/pugixml/src" />
240240
</Unit>
241-
<Unit filename="../ofxProjectGenerator/libs/pugixml/src/pugiconfig.hpp">
242-
<Option virtualFolder="../ofxProjectGenerator/libs/pugixml/src" />
241+
<Unit filename="libs/pugixml/src/pugiconfig.hpp">
242+
<Option virtualFolder="libs/pugixml/src" />
243243
</Unit>
244-
<Unit filename="../ofxProjectGenerator/libs/pugixml/src/pugixml.cpp">
245-
<Option virtualFolder="../ofxProjectGenerator/libs/pugixml/src" />
244+
<Unit filename="libs/pugixml/src/pugixml.cpp">
245+
<Option virtualFolder="libs/pugixml/src" />
246246
</Unit>
247247
</Project>
248248
</CodeBlocks_project_file>

‎commandLine/commandLine.qbs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ Project{
1717
]
1818

1919
of.addons: [
20-
'../ofxProjectGenerator',
21-
'ofxPoco',
2220
]
2321

2422
// This project is using addons.make to include the addons

‎commandLine/commandLine.vcxproj

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -56,18 +56,18 @@
5656
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
5757
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
5858
<WarningLevel>Level3</WarningLevel>
59-
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\addons\ofxPoco\libs\poco\include;..\..\..\addons\ofxPoco\src;..\ofxProjectGenerator\src;..\ofxProjectGenerator\src\addons;..\ofxProjectGenerator\src\projects;..\ofxProjectGenerator\src\utils</AdditionalIncludeDirectories>
59+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;src\addons;src\projects;src\utils;src\uuidxx</AdditionalIncludeDirectories>
6060
<CompileAs>CompileAsCpp</CompileAs>
6161
<ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
6262
<MultiProcessorCompilation>true</MultiProcessorCompilation>
63-
<AdditionalOptions>-DPOCO_STATIC</AdditionalOptions>
63+
<AdditionalOptions></AdditionalOptions>
6464
</ClCompile>
6565
<Link>
6666
<GenerateDebugInformation>true</GenerateDebugInformation>
6767
<SubSystem>Console</SubSystem>
6868
<RandomizedBaseAddress>false</RandomizedBaseAddress>
69-
<AdditionalDependencies>%(AdditionalDependencies);PocoCryptomdd.lib;PocoDatamdd.lib;PocoDataSQLitemdd.lib;PocoFoundationmdd.lib;PocoNetmdd.lib;PocoNetSSLmdd.lib;PocoPDFmdd.lib;PocoUtilmdd.lib;PocoXMLmdd.lib;PocoZipmdd.lib;iphlpapi.lib</AdditionalDependencies>
70-
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);..\..\..\addons\ofxPoco\libs\poco\lib\vs\x64\Debug;..\..\..\addons\ofxPoco</AdditionalLibraryDirectories>
69+
<AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
70+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);</AdditionalLibraryDirectories>
7171
</Link>
7272
<PostBuildEvent />
7373
</ItemDefinitionGroup>
@@ -77,10 +77,10 @@
7777
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
7878
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
7979
<WarningLevel>Level3</WarningLevel>
80-
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;..\..\..\addons\ofxPoco\libs\poco\include;..\..\..\addons\ofxPoco\src;..\ofxProjectGenerator\src;..\ofxProjectGenerator\src\addons;..\ofxProjectGenerator\src\projects;..\ofxProjectGenerator\src\utils</AdditionalIncludeDirectories>
80+
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);src;src\addons;src\projects;src\utils;src\uuidxx</AdditionalIncludeDirectories>
8181
<CompileAs>CompileAsCpp</CompileAs>
8282
<ObjectFileName>$(IntDir)/%(RelativeDir)/</ObjectFileName>
83-
<AdditionalOptions>-DPOCO_STATIC</AdditionalOptions>
83+
<AdditionalOptions></AdditionalOptions>
8484
</ClCompile>
8585
<Link>
8686
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@@ -89,38 +89,38 @@
8989
<OptimizeReferences>true</OptimizeReferences>
9090
<EnableCOMDATFolding>true</EnableCOMDATFolding>
9191
<RandomizedBaseAddress>false</RandomizedBaseAddress>
92-
<AdditionalDependencies>%(AdditionalDependencies);PocoCryptomd.lib;PocoDatamd.lib;PocoDataSQLitemd.lib;PocoFoundationmd.lib;PocoNetmd.lib;PocoNetSSLmd.lib;PocoPDFmd.lib;PocoUtilmd.lib;PocoXMLmd.lib;PocoZipmd.lib;iphlpapi.lib</AdditionalDependencies>
93-
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);..\..\..\addons\ofxPoco\libs\poco\lib\vs\x64\Release;..\..\..\addons\ofxPoco</AdditionalLibraryDirectories>
92+
<AdditionalDependencies>%(AdditionalDependencies);</AdditionalDependencies>
93+
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);</AdditionalLibraryDirectories>
9494
</Link>
9595
<PostBuildEvent />
9696
</ItemDefinitionGroup>
9797
<ItemGroup>
9898
<ClCompile Include="src\main.cpp" />
99-
<ClCompile Include="..\..\..\addons\ofxPoco\src\ofxXmlPoco.cpp" />
100-
<ClCompile Include="..\ofxProjectGenerator\src\addons\ofAddon.cpp" />
101-
<ClCompile Include="..\ofxProjectGenerator\src\projects\androidStudioProject.cpp" />
102-
<ClCompile Include="..\ofxProjectGenerator\src\projects\baseProject.cpp" />
103-
<ClCompile Include="..\ofxProjectGenerator\src\projects\CBLinuxProject.cpp" />
104-
<ClCompile Include="..\ofxProjectGenerator\src\projects\CBWinProject.cpp" />
105-
<ClCompile Include="..\ofxProjectGenerator\src\projects\qtcreatorproject.cpp" />
106-
<ClCompile Include="..\ofxProjectGenerator\src\projects\visualStudioProject.cpp" />
107-
<ClCompile Include="..\ofxProjectGenerator\src\projects\xcodeProject.cpp" />
108-
<ClCompile Include="..\ofxProjectGenerator\src\utils\LibraryBinary.cpp" />
109-
<ClCompile Include="..\ofxProjectGenerator\src\utils\Utils.cpp" />
99+
<ClCompile Include="src\addons\ofAddon.cpp" />
100+
<ClCompile Include="src\projects\androidStudioProject.cpp" />
101+
<ClCompile Include="src\projects\baseProject.cpp" />
102+
<ClCompile Include="src\projects\CBLinuxProject.cpp" />
103+
<ClCompile Include="src\projects\CBWinProject.cpp" />
104+
<ClCompile Include="src\projects\qtcreatorproject.cpp" />
105+
<ClCompile Include="src\projects\visualStudioProject.cpp" />
106+
<ClCompile Include="src\projects\xcodeProject.cpp" />
107+
<ClCompile Include="src\utils\LibraryBinary.cpp" />
108+
<ClCompile Include="src\utils\Utils.cpp" />
109+
<ClCompile Include="src\uuidxx\src\uuidxx.cpp" />
110110
</ItemGroup>
111111
<ItemGroup>
112112
<ClInclude Include="src\optionparser.h" />
113-
<ClInclude Include="..\..\..\addons\ofxPoco\src\ofxXmlPoco.h" />
114-
<ClInclude Include="..\ofxProjectGenerator\src\addons\ofAddon.h" />
115-
<ClInclude Include="..\ofxProjectGenerator\src\projects\androidStudioProject.h" />
116-
<ClInclude Include="..\ofxProjectGenerator\src\projects\baseProject.h" />
117-
<ClInclude Include="..\ofxProjectGenerator\src\projects\CBLinuxProject.h" />
118-
<ClInclude Include="..\ofxProjectGenerator\src\projects\CBWinProject.h" />
119-
<ClInclude Include="..\ofxProjectGenerator\src\projects\qtcreatorproject.h" />
120-
<ClInclude Include="..\ofxProjectGenerator\src\projects\visualStudioProject.h" />
121-
<ClInclude Include="..\ofxProjectGenerator\src\projects\xcodeProject.h" />
122-
<ClInclude Include="..\ofxProjectGenerator\src\utils\LibraryBinary.h" />
123-
<ClInclude Include="..\ofxProjectGenerator\src\utils\Utils.h" />
113+
<ClInclude Include="src\addons\ofAddon.h" />
114+
<ClInclude Include="src\projects\androidStudioProject.h" />
115+
<ClInclude Include="src\projects\baseProject.h" />
116+
<ClInclude Include="src\projects\CBLinuxProject.h" />
117+
<ClInclude Include="src\projects\CBWinProject.h" />
118+
<ClInclude Include="src\projects\qtcreatorproject.h" />
119+
<ClInclude Include="src\projects\visualStudioProject.h" />
120+
<ClInclude Include="src\projects\xcodeProject.h" />
121+
<ClInclude Include="src\utils\LibraryBinary.h" />
122+
<ClInclude Include="src\utils\Utils.h" />
123+
<ClCompile Include="src\uuidxx\src\uuidxx.cpp" />
124124
</ItemGroup>
125125
<ItemGroup>
126126
<ProjectReference Include="$(OF_ROOT)\libs\openFrameworksCompiled\project\vs\openframeworksLib.vcxproj">

0 commit comments

Comments
 (0)